diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-12-19 15:30:24 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-12-19 15:30:24 -0600 |
| commit | 7686335626ae4361191e189ac75649a5b2cd58e3 (patch) | |
| tree | b2719972d70c89c25fde0e037d810ff24f3bfe1a /testsuite | |
| parent | 1ad55cc4e22aa3c2c1daf0d7f6a99558d3da60bf (diff) | |
| download | bcfg2-7686335626ae4361191e189ac75649a5b2cd58e3.tar.gz bcfg2-7686335626ae4361191e189ac75649a5b2cd58e3.tar.bz2 bcfg2-7686335626ae4361191e189ac75649a5b2cd58e3.zip | |
testsuite/common.py: Default to using unittest2
Only fallback to unittest if unittest2 is unavailable.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/common.py b/testsuite/common.py index a86e9c5d9..4b29e5f52 100644 --- a/testsuite/common.py +++ b/testsuite/common.py @@ -16,9 +16,9 @@ import lxml.etree import Bcfg2.Options from mock import patch, MagicMock, _patch, DEFAULT try: - from unittest import skip, skipIf, skipUnless, TestCase -except ImportError: from unittest2 import skip, skipIf, skipUnless, TestCase +except ImportError: + from unittest import skip, skipIf, skipUnless, TestCase #: The XInclude namespace name XI_NAMESPACE = "http://www.w3.org/2001/XInclude" |