From 65c6e4df2a470626a656a1693e96f5f4886fd433 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 12 Aug 2015 16:52:15 +0200 Subject: [PATCH] Clarify status of excluded reverse dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 463 introduced waiting on reverse dependencies which are not built or⎵ installable yet, but set their status as "RUNNING". This is confusing as there is no actual test in progress yet. Instead, set their status to a new UNINST value, displaying as⎵ "Unbuilt/uninstallable" --- autopkgtest.py | 5 +++-- tests/test_autopkgtest.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/autopkgtest.py b/autopkgtest.py index 8efd660..31a932c 100644 --- a/autopkgtest.py +++ b/autopkgtest.py @@ -38,6 +38,7 @@ ADT_EXCUSES_LABELS = { "ALWAYSFAIL": 'Always failed', "REGRESSION": 'Regression', "RUNNING": 'Test in progress', + "UNINST": 'Unbuilt/uninstallable', } @@ -495,7 +496,7 @@ class AutoPackageTest(object): def results(self, trigsrc, trigver): '''Return test results for triggering package - Return (passed, src, ver, arch -> ALWAYSFAIL|PASS|FAIL|RUNNING) + Return (passed, src, ver, arch -> ALWAYSFAIL|PASS|FAIL|RUNNING|UNINST) iterator for all package tests that got triggered by trigsrc/trigver. ''' for testsrc, testver in self.tests_for_source(trigsrc, trigver): @@ -526,7 +527,7 @@ class AutoPackageTest(object): except KeyError: # neither done nor pending; excluded? if testsrc in self.excludes: - arch_status[arch] = 'RUNNING' + arch_status[arch] = 'UNINST' passed = False continue diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py index 79780cc..e1de222 100644 --- a/tests/test_autopkgtest.py +++ b/tests/test_autopkgtest.py @@ -387,7 +387,7 @@ lightgreen 1 i386 green 2 r'\blightgreen\b.*>1 to .*>2<', r'autopkgtest for green 2: .*amd64.*Pass.*i386.*Pass', r'autopkgtest for darkgreen 1: .*amd64.*Pass.*i386.*Pass', - r'autopkgtest for lightgreen 2: .*amd64.*in progress.*i386.*in progress', + r'autopkgtest for lightgreen 2: .*amd64.*Unbuilt/uninstallable.*i386.*Unbuilt/uninstallable', r'lightgreen has no up-to-date binaries on any arch'], ['Valid candidate'])