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

[Jelmer Vernooij]

The branch, master has been updated
       via  d3fe741 Test both cache and non-cache versions.
      from  6043bed Test both BuildFarm and CachingBuildFarm.

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


- Log -----------------------------------------------------------------
commit d3fe741c17f8401ae5dfe1d1fcd10992405ed7e7
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Nov 11 23:19:30 2010 +0100

    Test both cache and non-cache versions.

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

Summary of changes:
 buildfarm/tests/test_data.py |   66 +++++++++++++++++++++++++++++------------
 1 files changed, 46 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py
index d576fb3..9a5f867 100755
--- a/buildfarm/tests/test_data.py
+++ b/buildfarm/tests/test_data.py
@@ -17,7 +17,6 @@
 
 from cStringIO import StringIO
 import os
-import tempfile
 import testtools
 import time
 import unittest
@@ -34,25 +33,13 @@ class NonexistantTests(unittest.TestCase):
             Exception, data.BuildResultStore, "somedirthatdoesn'texist", None)
 
 
-class BuildResultStoreTests(BuildFarmTestCase):
-
-    def setUp(self):
-        super(BuildResultStoreTests, self).setUp()
-
-        self.x = data.CachingBuildResultStore(
-            os.path.join(self.path, "data", "oldrevs"),
-            os.path.join(self.path, "cache"))
+class BuildResultStoreTestBase(object):
 
     def test_build_fname(self):
         self.assertEquals(
             self.x.build_fname("mytree", "myhost", "cc", 123),
             "%s/data/oldrevs/build.mytree.myhost.cc-123" % self.path)
 
-    def test_cache_fname(self):
-        self.assertEquals(
-            self.x.cache_fname("mytree", "myhost", "cc", 123),
-            "%s/cache/build.mytree.myhost.cc-123" % self.path)
-
     def test_build_age_mtime(self):
         path = self.create_mock_logfile("tdb", "charis", "cc", "12")
         # Set mtime to something in the past
@@ -119,6 +106,31 @@ error3""")
         self.assertEquals(3, build.err_count())
 
 
+
+class BuildResultStoreTests(BuildFarmTestCase,BuildResultStoreTestBase):
+
+    def setUp(self):
+        super(BuildResultStoreTests, self).setUp()
+
+        self.x = data.BuildResultStore(
+            os.path.join(self.path, "data", "oldrevs"))
+
+
+class CachingBuildResultStoreTests(BuildFarmTestCase,BuildResultStoreTestBase):
+
+    def setUp(self):
+        super(CachingBuildResultStoreTests, self).setUp()
+
+        self.x = data.CachingBuildResultStore(
+            os.path.join(self.path, "data", "oldrevs"),
+            os.path.join(self.path, "cache"))
+
+    def test_cache_fname(self):
+        self.assertEquals(
+            self.x.cache_fname("mytree", "myhost", "cc", 123),
+            "%s/cache/build.mytree.myhost.cc-123" % self.path)
+
+
 class BuildStatusFromLogs(testtools.TestCase):
 
     def parse_logs(self, log, err):
@@ -252,21 +264,35 @@ class BuildStatusTest(testtools.TestCase):
         self.assertEquals(cmp(d, e), -1)
 
 
-class UploadBuildResultStoreTests(BuildFarmTestCase):
+class UploadBuildResultStoreTestBase(object):
+
+    def test_build_fname(self):
+        self.assertEquals(
+            self.x.build_fname("mytree", "myhost", "cc"),
+            "%s/data/upload/build.mytree.myhost.cc" % self.path)
+
+
+class UploadBuildResultStoreTests(UploadBuildResultStoreTestBase,BuildFarmTestCase):
 
     def setUp(self):
         super(UploadBuildResultStoreTests, self).setUp()
 
+        self.x = data.UploadBuildResultStore(
+            os.path.join(self.path, "data", "upload"))
+
+
+class CachingUploadBuildResultStoreTests(UploadBuildResultStoreTestBase,BuildFarmTestCase):
+
+    def setUp(self):
+        super(CachingUploadBuildResultStoreTests, self).setUp()
+
         self.x = data.CachingUploadBuildResultStore(
             os.path.join(self.path, "data", "upload"),
             os.path.join(self.path, "cache"))
 
-    def test_build_fname(self):
-        self.assertEquals(
-            self.x.build_fname("mytree", "myhost", "cc"),
-            "%s/data/upload/build.mytree.myhost.cc" % self.path)
-
     def test_cache_fname(self):
         self.assertEquals(
             self.x.cache_fname("mytree", "myhost", "cc"),
             "%s/cache/build.mytree.myhost.cc" % self.path)
+
+


-- 
build.samba.org