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

[Jelmer Vernooij]

The branch, master has been updated
       via  6043bed Test both BuildFarm and CachingBuildFarm.
      from  3de05b3 Add some more base buildfarm tests.

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


- Log -----------------------------------------------------------------
commit 6043bede719fb9eebab45f22e2fd1b51fee94981
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Nov 11 22:59:47 2010 +0100

    Test both BuildFarm and CachingBuildFarm.

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

Summary of changes:
 buildfarm/tests/test_buildfarm.py |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/tests/test_buildfarm.py b/buildfarm/tests/test_buildfarm.py
index 9132445..4cec0b7 100644
--- a/buildfarm/tests/test_buildfarm.py
+++ b/buildfarm/tests/test_buildfarm.py
@@ -17,6 +17,7 @@
 
 from buildfarm import (
     BuildFarm,
+    CachingBuildFarm,
     data,
     read_trees_from_conf,
     )
@@ -73,13 +74,11 @@ branch = HEAD
             "git")
 
 
-class BuildFarmTests(BuildFarmTestCase):
+class BuildFarmTestBase(object):
 
     def setUp(self):
-        super(BuildFarmTests, self).setUp()
         self.write_compilers(["cc"])
         self.write_trees({"trivial": { "scm": "git", "repo": "git://foo", "branch": "master" }})
-        self.x = BuildFarm(self.path)
 
     def test_get_new_builds_empty(self):
         self.assertEquals([], list(self.x.get_new_builds()))
@@ -93,3 +92,19 @@ class BuildFarmTests(BuildFarmTestCase):
         self.assertEquals("git", tree.scm)
         self.assertEquals("git://foo", tree.repo)
         self.assertEquals("master", tree.branch)
+
+
+class BuildFarmTests(BuildFarmTestBase, BuildFarmTestCase):
+
+    def setUp(self):
+        BuildFarmTestCase.setUp(self)
+        BuildFarmTestBase.setUp(self)
+        self.x = BuildFarm(self.path)
+
+
+class CachingBuildFarmTests(BuildFarmTestBase, BuildFarmTestCase):
+
+    def setUp(self):
+        BuildFarmTestCase.setUp(self)
+        BuildFarmTestBase.setUp(self)
+        self.x = CachingBuildFarm(self.path)


-- 
build.samba.org