diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 15:57:51 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 15:57:51 -0400 |
commit | fc29986ddf780202651053aeafa308653f05d2dd (patch) | |
tree | 82e44af496d20506ead215f25b2fb5a0cc82a359 /testsuite/Testlib/TestClient/TestTools/TestPOSIX | |
parent | b2d11440759e79d8485a22ba71933b691ff749a4 (diff) | |
download | bcfg2-fc29986ddf780202651053aeafa308653f05d2dd.tar.gz bcfg2-fc29986ddf780202651053aeafa308653f05d2dd.tar.bz2 bcfg2-fc29986ddf780202651053aeafa308653f05d2dd.zip |
minor test fixes
Diffstat (limited to 'testsuite/Testlib/TestClient/TestTools/TestPOSIX')
-rw-r--r-- | testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py index d1f3ed14d..9582636fc 100644 --- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py +++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py @@ -120,27 +120,24 @@ class TestPOSIXFile(TestPOSIXTool): mock_get_data.return_value = ("test", False) exists_rv.__getitem__.return_value = 4 entry.set("sensitive", "true") - open_rv = Mock() - open_rv.read.return_value = "tart" - mock_open.return_value = open_rv + mock_open.return_value.read.return_value = "tart" self.assertFalse(ptool.verify(entry, [])) mock_exists.assert_called_with(entry) mock_verify.assert_called_with(ptool, entry, []) mock_open.assert_called_with(entry.get("name")) - open_rv.assert_any_call() + mock_open.return_value.read.assert_called_with() mock_get_diffs.assert_called_with(entry, interactive=False, sensitive=True, is_binary=False, content="tart") reset() - open_rv.read.return_value = "test" - mock_open.return_value = open_rv + mock_open.return_value.read.return_value = "test" self.assertTrue(ptool.verify(entry, [])) mock_exists.assert_called_with(entry) mock_verify.assert_called_with(ptool, entry, []) mock_open.assert_called_with(entry.get("name")) - open_rv.assert_any_call() + mock_open.return_value.read.assert_called_with() self.assertFalse(mock_get_diffs.called) reset() |