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

Jelmer Vernooij jelmer at samba.org
Mon Aug 18 13:46:37 MDT 2014


The branch, master has been updated
       via  4cc7c29 Re-enable buildfarm tests.
       via  b60f215 Reuse DEADAGE rather than defining our own constant.
      from  295dc1a Add constant for maximum build age.

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


- Log -----------------------------------------------------------------
commit 4cc7c2975425c558ad8c4c3dfd689ad09f0d3760
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Aug 18 21:46:28 2014 +0200

    Re-enable buildfarm tests.

commit b60f215d1fa2f04bee4c650efbba629a215fda6f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Aug 2 21:43:06 2014 +0200

    Reuse DEADAGE rather than defining our own constant.

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

Summary of changes:
 TODO                              |    1 +
 buildfarm/tests/__init__.py       |    1 +
 buildfarm/tests/test_buildfarm.py |    8 ++------
 buildfarm/web/__init__.py         |    7 +------
 4 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 TODO


Changeset truncated at 500 lines:

diff --git a/TODO b/TODO
new file mode 100644
index 0000000..1480b02
--- /dev/null
+++ b/TODO
@@ -0,0 +1 @@
+- age is misnamed
diff --git a/buildfarm/tests/__init__.py b/buildfarm/tests/__init__.py
index bc66ab1..d5abd68 100644
--- a/buildfarm/tests/__init__.py
+++ b/buildfarm/tests/__init__.py
@@ -109,6 +109,7 @@ def test_suite():
     names = [
         '__init__',
         'test_build',
+        'test_buildfarm',
         'test_history',
         'test_hostdb',
         'test_sqldb',
diff --git a/buildfarm/tests/test_buildfarm.py b/buildfarm/tests/test_buildfarm.py
index 417576b..2cc1b33 100644
--- a/buildfarm/tests/test_buildfarm.py
+++ b/buildfarm/tests/test_buildfarm.py
@@ -131,12 +131,8 @@ class BuildFarmTests(BuildFarmTestCase):
             "BUILD COMMIT REVISION: 42\n", mtime=4200)
         builds = list(self.x.get_summary_builds())
         self.assertEquals(2, len(builds))
-        self.assertEquals(4200, builds[0].upload_time)
-        self.assertEquals("42", builds[0].revision_details())
-        self.assertEquals("trivial", builds[0].tree)
-        self.assertEquals(1200, builds[1].upload_time)
-        self.assertEquals("12", builds[1].revision_details())
-        self.assertEquals("other", builds[1].tree)
+        self.assertEquals("other", builds[0][0])
+        self.assertEquals("trivial", builds[1][0])
         builds = list(self.x.get_summary_builds(min_age=4000))
         self.assertEquals(1, len(builds))
         builds = list(self.x.get_summary_builds(min_age=5000))
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 7cd1a7e..3b3c38d 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -58,11 +58,6 @@ webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "we
 GITWEB_BASE = "https://gitweb.samba.org"
 HISTORY_HORIZON = 1000
 
-# Maximum age of builds to consider when displaying summary page statistics.
-# Note that trees only get rebuilt when they change, so this value is
-# intentionally set to a high value to cope with trees that don't change often.
-SUMMARY_MAX_BUILD_AGE = (180 * 24 * 60 * 60)
-
 # this is automatically filled in
 deadhosts = []
 
@@ -732,7 +727,7 @@ class ViewSummaryPage(BuildFarmPage):
         # output when we want
         broken_table = ""
 
-        builds = self.buildfarm.get_summary_builds(min_age=time.time() - SUMMARY_MAX_BUILD_AGE)
+        builds = self.buildfarm.get_summary_builds(min_age=time.time() - BuildFarm.DEADAGE)
 
         for tree, status in builds:
             host_count[tree]+=1


-- 
build.samba.org


More information about the samba-cvs mailing list