summaryrefslogtreecommitdiffstats
path: root/tests/unit/test_log.py
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-02-17 15:22:44 +0000
committerMark McLoughlin <markmc@redhat.com>2013-02-17 15:44:00 +0000
commitf63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3 (patch)
treefc46499db82de0829e1137b1d620bceb46cb787f /tests/unit/test_log.py
parent8ce59472653439d646309395bf195ec6163ff29a (diff)
downloadoslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.tar.gz
oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.tar.xz
oslo-f63ea05f7c36ece6aad0fdc8e02f4d5d30c673a3.zip
Use oslo-config-2013.1b3
The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b3 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Remove the 'deps = pep8==1.3.3' and 'deps = pyflakes' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
Diffstat (limited to 'tests/unit/test_log.py')
-rw-r--r--tests/unit/test_log.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
index a0788f1..6a1eeb2 100644
--- a/tests/unit/test_log.py
+++ b/tests/unit/test_log.py
@@ -3,7 +3,8 @@ import logging
import StringIO
import sys
-from openstack.common import cfg
+from oslo.config import cfg
+
from openstack.common import context
from openstack.common import jsonutils
from openstack.common import log