summaryrefslogtreecommitdiffstats
path: root/testsuite/common.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-27 14:33:34 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-27 14:33:34 -0400
commit1bdb14055dd1b2395047793ee28c17bbae65c845 (patch)
tree2224d9de85871f936f8f63582ab349df0ecfdc6c /testsuite/common.py
parent40d74d9a4bcca2452def08a0890c08fdca864d4c (diff)
downloadbcfg2-1bdb14055dd1b2395047793ee28c17bbae65c845.tar.gz
bcfg2-1bdb14055dd1b2395047793ee28c17bbae65c845.tar.bz2
bcfg2-1bdb14055dd1b2395047793ee28c17bbae65c845.zip
wrote unit tests for Properties
Diffstat (limited to 'testsuite/common.py')
-rw-r--r--testsuite/common.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/testsuite/common.py b/testsuite/common.py
index fc79e73e7..3aeeaf5f2 100644
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -3,12 +3,7 @@ import re
import sys
import unittest
from mock import patch, MagicMock, _patch, DEFAULT
-
-try:
- from functools import wraps
-except ImportError:
- def wraps(wrapped):
- return lambda f: f
+from Bcfg2.Compat import wraps
datastore = "/"
@@ -33,6 +28,7 @@ try:
except ImportError:
has_django = False
+
try:
from mock import call
except ImportError: