diff options
author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2014-10-29 13:28:09 +0000 |
---|---|---|
committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2014-10-29 13:28:09 +0000 |
commit | ed9de1ececb9bea73ac7d4ad91b7c56588698005 (patch) | |
tree | 3faf82f3f01942bca2410b258993dfb216d6f908 | |
parent | 25f0e292aedc61673b5a5041d5ebce3a1fdf9d73 (diff) |
testmanager: multiple data download fixes
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
-rw-r--r-- | templates/testrunner/jenkins_build_view.html | 4 | ||||
-rw-r--r-- | templates/testrunner/lava_job_view.html | 4 | ||||
-rw-r--r-- | testmanager/testplanner/management/commands/clonerepos.py | 2 | ||||
-rw-r--r-- | testmanager/testplanner/management/commands/pullrepos.py | 6 | ||||
-rw-r--r-- | testmanager/testrunner/models.py | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/templates/testrunner/jenkins_build_view.html b/templates/testrunner/jenkins_build_view.html index cf5e92d..bece02e 100644 --- a/templates/testrunner/jenkins_build_view.html +++ b/templates/testrunner/jenkins_build_view.html @@ -124,7 +124,8 @@ </tr> </thead> <tbody id="job-status-body"> - {% for testdef, testresult in lavajob.get_definitions_results %} + {% for testdef, testresult_list in lavajob.get_definitions_results %} + {% for testresult in testresult_list %} <tr> <td>{{ testdef.name }}</td> <td>{% if testresult %} OK {% else %} Missing {% endif %}</td> @@ -137,6 +138,7 @@ {% endif %} </td> </tr> + {% endfor %} {% endfor %} </tbody> </table> diff --git a/templates/testrunner/lava_job_view.html b/templates/testrunner/lava_job_view.html index 39def86..fc5091a 100644 --- a/templates/testrunner/lava_job_view.html +++ b/templates/testrunner/lava_job_view.html @@ -57,7 +57,8 @@ <ul> - {% for testdef, testresult in lava_job.get_definitions_results %} + {% for testdef, testresult_list in lava_job.get_definitions_results %} + {% for testresult in testresult_list %} <li {% if not testresult %} style="color:red"{% endif %}> {{ testdef.name }} - {% if testresult %} OK ({{ testresult.get_resultset_total }} {% for status_name, status_count in testresult.get_resultset_count_by_status.items %} | {{ status_name }}: {{ status_count }}{% endfor %}) {% else %} Missing {% endif %} <ul> {% for testcase in testresult.lavajobtestresult_set.all %} @@ -66,6 +67,7 @@ </ul> </li> {% endfor %} + {% endfor %} </ul> {% endif %} diff --git a/testmanager/testplanner/management/commands/clonerepos.py b/testmanager/testplanner/management/commands/clonerepos.py index 19a1641..e118c3b 100644 --- a/testmanager/testplanner/management/commands/clonerepos.py +++ b/testmanager/testplanner/management/commands/clonerepos.py @@ -33,7 +33,7 @@ class Command(BaseCommand): def handle(self, *args, **options): for repository in TestRepository.objects.all(): if not repository.is_cloned: - dirname = repository.url.split("/")[-1] + dirname = repository.url.replace("/", "_").replace(":", "_") local_repo_dir = "%s/%s" % (settings.REPOSITORIES_HOME, dirname) r = Repo.clone_from(repository.url, local_repo_dir) repository.local_dir = local_repo_dir diff --git a/testmanager/testplanner/management/commands/pullrepos.py b/testmanager/testplanner/management/commands/pullrepos.py index f9c52f5..bbbaa16 100644 --- a/testmanager/testplanner/management/commands/pullrepos.py +++ b/testmanager/testplanner/management/commands/pullrepos.py @@ -29,9 +29,9 @@ log = logging.getLogger('testplanner') class Command(BaseCommand): def handle(self, *args, **options): for repository in TestRepository.objects.filter(is_cloned=True): - dirname = repository.url.split("/")[-1] - local_repo_dir = "%s/%s" % (settings.REPOSITORIES_HOME, dirname) - r = Repo(local_repo_dir) + #dirname = repository.url.split("/")[-1] + #local_repo_dir = "%s/%s" % (settings.REPOSITORIES_HOME, dirname) + r = Repo(repository.local_dir) origin = r.remotes.origin origin.pull() copy_commits_to_db(r, repository, repository.head_revision) diff --git a/testmanager/testrunner/models.py b/testmanager/testrunner/models.py index f2fffa1..b3d578d 100644 --- a/testmanager/testrunner/models.py +++ b/testmanager/testrunner/models.py @@ -159,7 +159,7 @@ class LavaJob(models.Model): for testdef in self.test_definitions.all(): resultset = LavaJobResult.objects.filter(lava_job = self, test_definition = testdef) if resultset: - result_list.append((testdef, resultset[0])) + result_list.append((testdef, resultset)) else: result_list.append((testdef, None)) return result_list |