summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-06-13 15:25:02 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-06-13 15:25:02 -0400
commit75dd86ddeff6f275699ce4f26661431f8579e2d7 (patch)
tree75ffab892fb4320497ca6fc294b43a00f8f73413 /testsuite
parenta03fde3ea32d3eb2cadb443454749111dda1797f (diff)
downloadbcfg2-75dd86ddeff6f275699ce4f26661431f8579e2d7.tar.gz
bcfg2-75dd86ddeff6f275699ce4f26661431f8579e2d7.tar.bz2
bcfg2-75dd86ddeff6f275699ce4f26661431f8579e2d7.zip
testsuite: fixed tests for a03fde3ea32d3eb2cadb443454749111dda1797f
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py37
1 files changed, 19 insertions, 18 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
index 318f5ceaa..5fc850b2b 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
@@ -80,24 +80,25 @@ class TestPlugin(TestDebuggable):
@patch("os.makedirs")
@patch("os.path.exists")
def test__init(self, mock_exists, mock_makedirs):
- core = Mock()
- core.setup = MagicMock()
-
- mock_exists.return_value = True
- p = self.get_obj(core=core)
- self.assertEqual(p.data, os.path.join(datastore, p.name))
- self.assertEqual(p.core, core)
- mock_exists.assert_any_call(p.data)
- self.assertFalse(mock_makedirs.called)
-
- mock_exists.reset_mock()
- mock_makedirs.reset_mock()
- mock_exists.return_value = False
- p = self.get_obj(core=core)
- self.assertEqual(p.data, os.path.join(datastore, p.name))
- self.assertEqual(p.core, core)
- mock_exists.assert_any_call(p.data)
- mock_makedirs.assert_any_call(p.data)
+ if test_obj.create:
+ core = Mock()
+ core.setup = MagicMock()
+
+ mock_exists.return_value = True
+ p = self.get_obj(core=core)
+ self.assertEqual(p.data, os.path.join(datastore, p.name))
+ self.assertEqual(p.core, core)
+ mock_exists.assert_any_call(p.data)
+ self.assertFalse(mock_makedirs.called)
+
+ mock_exists.reset_mock()
+ mock_makedirs.reset_mock()
+ mock_exists.return_value = False
+ p = self.get_obj(core=core)
+ self.assertEqual(p.data, os.path.join(datastore, p.name))
+ self.assertEqual(p.core, core)
+ mock_exists.assert_any_call(p.data)
+ mock_makedirs.assert_any_call(p.data)
@patch("os.makedirs")
def test_init_repo(self, mock_makedirs):