[SCM] build.samba.org - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  131284c Fix formatting.
       via  3cca93b Add extra test for regressed_since.
      from  9233c19 Fix formatting.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 131284c335702f58849150ad83d8b87c23fbe359
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 22 01:05:25 2010 +0100

    Fix formatting.

commit 3cca93b557766962841bf6665b6b9fb7a40f23a1
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 22 01:05:14 2010 +0100

    Add extra test for regressed_since.

-----------------------------------------------------------------------

Summary of changes:
 buildfarm/data.py            |   10 ++++++----
 buildfarm/tests/test_data.py |    5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/data.py b/buildfarm/data.py
index 90345f8..5ae1286 100644
--- a/buildfarm/data.py
+++ b/buildfarm/data.py
@@ -92,11 +92,13 @@ class BuildStatus(object):
         """Check if this build has regressed since another build."""
         if "disk full" in self.other_failures:
             return False
-        if "timeout" in self.other_failures and "timeout" in older.other_failures:
-            # When the timeout happens exactly can differ slightly, so it's okay
-            # if the numbers are a bit different..
+        if ("timeout" in self.other_failures and
+            "timeout" in older.other_failures):
+            # When the timeout happens exactly can differ slightly, so it's
+            # okay if the numbers are a bit different..
             return False
-        if "panic" in self.other_failures and not "panic" in older.other_failures:
+        if ("panic" in self.other_failures and
+            not "panic" in older.other_failures):
             return True
         if len(self.stages) < len(older.stages):
             # Less stages completed
diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py
index 9388f6e..c507a8c 100755
--- a/buildfarm/tests/test_data.py
+++ b/buildfarm/tests/test_data.py
@@ -345,6 +345,11 @@ class BuildStatusRegressedSinceTests(testtools.TestCase):
             ([("CONFIGURE", 0), ("BUILD", 0), ("TEST", 0), ("INSTALL", 1)], []),
             ([("CONFIGURE", 0), ("BUILD", 0), ("TEST", 0), ("INSTALL", 0)], []))
 
+    def test_no_longer_inconsistent(self):
+        self.assertRegressedSince(
+            False,
+            ([("CONFIGURE", 0)], ["inconsistent test result"]),
+            ([("CONFIGURE", 0)], []))
 
 
 class UploadBuildResultStoreTestBase(object):


-- 
build.samba.org