[Piuparts-commits] rev 762 - in trunk: . debian piupartslib

[Holger Levsen]

Author: holger
Date: 2010-11-13 19:26:05 +0000 (Sat, 13 Nov 2010)
New Revision: 762

Modified:
   trunk/debian/changelog
   trunk/piuparts-master.py
   trunk/piuparts-report.py
   trunk/piupartslib/packagesdb.py
   trunk/unittests.py
Log:
* piupartsib/packagesdb.py: 
  - get rid of the long unused states "fixed" and "fix-not-yet-tested"
    (also in piuparts-master and piuparts-report).

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-11-13 19:03:50 UTC (rev 761)
+++ trunk/debian/changelog	2010-11-13 19:26:05 UTC (rev 762)
@@ -15,18 +15,21 @@
      - visual improvements in the output.
      - ignore udebs and binaries from other archs too.
      - graph is generated using all the available data points.
-  * piupartsib/packagesdb.py: automatically break circular dependencies when
-    there are only circular dependencies left, using a configurable list of
-    circular depdencies in piuparts.conf (Closes: #526046)
-      The list of circular depends is taken from a script written by Robert
-    Lemmen available at http://debian.semistable.com/debgraph.out.html -
-    obviously it would be better to merge this into piuparts directly.
-      Note that the dependecy resovler is still buggy, the state
-    waiting-for-dependency-to-be-tested still contains some packages
-    which failed depends (due to them being dependent on packages with
-    circular depends). The effect of that is none, other than that
-    (=waiting-to-be-tested is calculated correctly). This bug was present
-    before this change.
+  * piupartsib/packagesdb.py: 
+    - automatically break circular dependencies when there are only circular
+      dependencies left, using a configurable list of circular depdencies in 
+      piuparts.conf (Closes: #526046)
+        The list of circular depends is taken from a script written by Robert
+      Lemmen available at http://debian.semistable.com/debgraph.out.html -
+      obviously it would be better to merge this into piuparts directly.
+        Note that the dependecy resovler is still buggy, the state
+      waiting-for-dependency-to-be-tested still contains some packages
+      which failed depends (due to them being dependent on packages with
+      circular depends). The effect of that is none, other than that
+      (=waiting-to-be-tested is calculated correctly). This bug was present
+      before this change.
+    - get rid of the long unused states "fixed" and "fix-not-yet-tested"
+      (also in piuparts-master and piuparts-report).
   * piuparts-slave.py: 
     - fix crash when going into sleep when idle. 
     - add support for only doing upgrade tests (without the basic test in the

Modified: trunk/piuparts-master.py
===================================================================
--- trunk/piuparts-master.py	2010-11-13 19:03:50 UTC (rev 761)
+++ trunk/piuparts-master.py	2010-11-13 19:26:05 UTC (rev 762)
@@ -108,7 +108,6 @@
 
     _failed_states = (
         "failed-testing",
-        "fix-not-yet-tested",
     )
     _passed_states = (
         "successfully-tested",

Modified: trunk/piuparts-report.py
===================================================================
--- trunk/piuparts-report.py	2010-11-13 19:03:50 UTC (rev 761)
+++ trunk/piuparts-report.py	2010-11-13 19:26:05 UTC (rev 762)
@@ -328,7 +328,6 @@
     "pass": "PASSED piuparts logs",
     "fail": "Failed UNREPORTED piuparts logs",
     "bugged": "Failed REPORTED piuparts logs",
-    "fixed": "Failed and FIXED packages",
     "reserved": "RESERVED packages",
     "untestable": "UNTESTABLE packages",
 }
@@ -340,8 +339,6 @@
             "Bugs have not yet been reported.",
     "bugged": "Log files for packages that have FAILED testing. " +
               "Bugs have been reported, but not yet fixed.",
-    "fixed": "Log files for packages that have FAILED testing, but for " +
-             "which a fix has been made.",
     "reserved": "Packages that are RESERVED for testing on a node in a " +
                 "distributed piuparts network.",
     "untestable": "Log files for packages that have are UNTESTABLE with " +
@@ -352,7 +349,6 @@
     "pass": "successfully-tested",
     "fail": "failed-testing",
     "bugged": "failed-testing",
-    "fixed": "fix-not-yet-tested",
     "reserved": "waiting-to-be-tested",
     "untestable": "dependency-cannot-be-tested",
 }

Modified: trunk/piupartslib/packagesdb.py
===================================================================
--- trunk/piupartslib/packagesdb.py	2010-11-13 19:03:50 UTC (rev 761)
+++ trunk/piupartslib/packagesdb.py	2010-11-13 19:26:05 UTC (rev 762)
@@ -222,7 +222,6 @@
     _states = [
         "successfully-tested",
         "failed-testing",
-        "fix-not-yet-tested",
         "cannot-be-tested",
         "essential-required",
         "waiting-to-be-tested",
@@ -230,14 +229,12 @@
         "dependency-failed-testing",
         "dependency-cannot-be-tested",
         "dependency-does-not-exist",
-        "dependency-fix-not-yet-tested",
         "circular-dependency",
         "unknown",
     ]
     
     _dep_state_to_state = {
         "failed-testing": "dependency-failed-testing",
-        "fix-not-yet-tested": "dependency-fix-not-yet-tested",
         "cannot-be-tested": "dependency-cannot-be-tested",
         "waiting-to-be-tested": "waiting-for-dependency-to-be-tested",
         "waiting-for-dependency-to-be-tested": "waiting-for-dependency-to-be-tested",
@@ -245,7 +242,6 @@
         "dependency-cannot-be-tested": "dependency-cannot-be-tested",
         "dependency-does-not-exist": "dependency-does-not-exist",
         "circular-dependency": "circular-dependency",
-        "dependency-fix-not-yet-tested": "dependency-fix-not-yet-tested",
     }
 
     def __init__(self, logdb=None, prefix=None):
@@ -258,11 +254,9 @@
         self._in_state = None
         self._package_state = {}
         self.set_subdirs(ok="pass", fail="fail", evil="untestable",
-                         reserved="reserved", moreok=["fixed"],
-                         morefail=["bugged"])
+                         reserved="reserved", morefail=["bugged"])
         
-    def set_subdirs(self, ok=None, fail=None, evil=None, reserved=None,
-                    moreok=None, morefail=None):
+    def set_subdirs(self, ok=None, fail=None, evil=None, reserved=None, morefail=None):
         # Prefix all the subdirs with the prefix
         if self.prefix:
             format = self.prefix + "/%s"
@@ -277,12 +271,9 @@
             self._evil = format % evil
         if reserved:
             self._reserved = format % reserved
-        if moreok:
-            self._moreok = [format % s for s in moreok]
         if morefail:
             self._morefail = [format % s for s in morefail]
-        self._all = [self._ok, self._fail, self._evil, self._reserved] + \
-                    self._moreok + self._morefail
+        self._all = [self._ok, self._fail, self._evil, self._reserved] + self._morefail
            
     def create_subdirs(self):
         for dir in self._all:
@@ -330,8 +321,6 @@
             return "successfully-tested"
         if self._logdb.log_exists(package, [self._fail] + self._morefail):
             return "failed-testing"
-        if self._logdb.log_exists(package, self._moreok):
-            return "fix-not-yet-tested"
         if self._logdb.any_log_exists(package, [self._evil]):
             return "cannot-be-tested"
         if not package.is_testable():

Modified: trunk/unittests.py
===================================================================
--- trunk/unittests.py	2010-11-13 19:03:50 UTC (rev 761)
+++ trunk/unittests.py	2010-11-13 19:26:05 UTC (rev 762)
@@ -54,7 +54,6 @@
             "untestable": [],
             "reserved": [],
             "bugged": [],
-            "fixed": [],
         }
         
     def listdir(self, dirname):