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/common.py | |
| 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/common.py')
| -rw-r--r-- | testsuite/common.py | 5 |
1 files changed, 4 insertions, 1 deletions
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: |