diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2016-01-27 08:03:58 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2016-01-27 08:03:58 -0600 |
| commit | 2ce8277b91c4f944cdcf5ec6bcbadece79df0d39 (patch) | |
| tree | 2eedcfa509c43062f9e2ff3b3a80050594e86cb9 /testsuite | |
| parent | a112a7f28d94cbad43c77f1643dce45b97e5f364 (diff) | |
| parent | cf18b67f7d55dfe08267d897b9a2fc877fdcbefa (diff) | |
| download | bcfg2-2ce8277b91c4f944cdcf5ec6bcbadece79df0d39.tar.gz bcfg2-2ce8277b91c4f944cdcf5ec6bcbadece79df0d39.tar.bz2 bcfg2-2ce8277b91c4f944cdcf5ec6bcbadece79df0d39.zip | |
Merge branch 'fix/mock-patch' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py | 8 | ||||
| -rw-r--r-- | testsuite/common.py | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py index cc1ea6fd7..08c20981d 100644 --- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py +++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py @@ -103,26 +103,26 @@ class TestPOSIXUsers(TestTool): # test failure of inherited method entry = lxml.etree.Element("POSIXUser", name="test") self.assertFalse(users.canInstall(entry)) - mock_canInstall.assertCalledWith(users, entry) + mock_canInstall.assert_called_with(users, entry) # test with no uid specified reset() mock_canInstall.return_value = True self.assertTrue(users.canInstall(entry)) - mock_canInstall.assertCalledWith(users, entry) + mock_canInstall.assert_called_with(users, entry) # test with uid specified, not in managed range reset() entry.set("uid", "1000") self.assertFalse(users.canInstall(entry)) - mock_canInstall.assertCalledWith(users, entry) + mock_canInstall.assert_called_with(users, entry) users._in_managed_range.assert_called_with(entry.tag, "1000") # test with uid specified, in managed range reset() users._in_managed_range.return_value = True self.assertTrue(users.canInstall(entry)) - mock_canInstall.assertCalledWith(users, entry) + mock_canInstall.assert_called_with(users, entry) users._in_managed_range.assert_called_with(entry.tag, "1000") @patch("Bcfg2.Client.Tools.Tool.Inventory") diff --git a/testsuite/common.py b/testsuite/common.py index 9f51cc14f..396f1887b 100644 --- a/testsuite/common.py +++ b/testsuite/common.py @@ -15,7 +15,10 @@ import codecs import lxml.etree import Bcfg2.Options import Bcfg2.Utils -from mock import patch, MagicMock, _patch, DEFAULT +try: + from mock.mock import patch, MagicMock, _patch, DEFAULT +except ImportError: + from mock import patch, MagicMock, _patch, DEFAULT try: from unittest2 import skip, skipIf, skipUnless, TestCase except ImportError: |