Skip unit tests when buildbot-www isn't available

buildbot · Apr 17, 2013 · a594a60 · a594a60
1 parent 87e6d73
commit a594a60
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/master/buildbot/test/unit/test_scripts_create_master.py b/master/buildbot/test/unit/test_scripts_create_master.py
@@ -21,7 +21,7 @@
 from twisted.internet import defer
 from buildbot.scripts import create_master
 from buildbot.db import connector, model
-from buildbot.test.util import dirs, misc
+from buildbot.test.util import dirs, misc, www
 
 def mkconfig(**kwargs):
     config = dict(force=False, relocatable=False, config='master.cfg',
@@ -78,8 +78,8 @@ def check(_):
             self.assertInStdout('buildmaster configured in')
         return d
 
-class TestCreateMasterFunctions(dirs.DirsMixin, misc.StdoutAssertionsMixin,
-                                unittest.TestCase):
+class TestCreateMasterFunctions(www.WwwTestMixin, dirs.DirsMixin,
+                                misc.StdoutAssertionsMixin, unittest.TestCase):
 
     def setUp(self):
         self.setUpDirs('test')

diff --git a/master/buildbot/test/unit/test_scripts_upgrade_master.py b/master/buildbot/test/unit/test_scripts_upgrade_master.py
@@ -22,7 +22,7 @@
 from buildbot.scripts import upgrade_master
 from buildbot import config as config_module
 from buildbot.db import connector, model
-from buildbot.test.util import dirs, misc, compat
+from buildbot.test.util import dirs, misc, compat, www
 
 def mkconfig(**kwargs):
     config = dict(quiet=False, replace=False, basedir='test')
@@ -98,8 +98,8 @@ def check(rv):
             self.assertEqual(rv, 1)
         return d
 
-class TestUpgradeMasterFunctions(dirs.DirsMixin, misc.StdoutAssertionsMixin,
-                                unittest.TestCase):
+class TestUpgradeMasterFunctions(www.WwwTestMixin, dirs.DirsMixin,
+                                 misc.StdoutAssertionsMixin, unittest.TestCase):
 
     def setUp(self):
         self.setUpDirs('test')

diff --git a/master/buildbot/test/unit/test_util_namespace.py b/master/buildbot/test/unit/test_util_namespace.py
@@ -17,8 +17,9 @@
 from buildbot.util import namespace
 import pickle
 from buildbot.util import json
+from buildbot.test.util import www
 
-class Namespace(unittest.TestCase):
+class Namespace(www.WwwTestMixin, unittest.TestCase):
 
     def test_basic(self):
         n = namespace.Namespace({'a':{'b':{'c':1}}})