Fix testing

Update hacking version so that it works with newer pbr releases, other
requirements depend on newer pbr and this causes a conflict.

Add pbr to requirements since it's needed.

Add pep8 ignore for those tests that currently fail.

Rename oslo.config to oslo_config in imports.

Change-Id: I23c0afa855be4773a8799d09d1cda011e85367bd
This commit is contained in:
Andreas Jaeger 2015-12-20 11:42:10 +01:00
parent 06460e0d75
commit 5d1a9375dc
6 changed files with 7 additions and 5 deletions

View File

@ -16,7 +16,7 @@
# under the License. # under the License.
import fixtures import fixtures
from oslo.config import cfg from oslo_config import cfg
import six import six

View File

@ -25,7 +25,7 @@ import threading
import time import time
import weakref import weakref
from oslo.config import cfg from oslo_config import cfg
from climateclient.openstack.common import fileutils from climateclient.openstack.common import fileutils
from climateclient.openstack.common.gettextutils import _ from climateclient.openstack.common.gettextutils import _

View File

@ -37,7 +37,7 @@ import re
import sys import sys
import traceback import traceback
from oslo.config import cfg from oslo_config import cfg
import six import six
from six import moves from six import moves

View File

@ -1,3 +1,4 @@
pbr>=1.6
cliff>=1.6.0 cliff>=1.6.0
PrettyTable>=0.7,<0.8 PrettyTable>=0.7,<0.8
python-keystoneclient>=0.10.0 python-keystoneclient>=0.10.0

View File

@ -1,5 +1,4 @@
hacking>=0.8.0,<0.9 hacking>=0.10.2,<0.11
discover discover
mock>=1.0 mock>=1.0
mox>=0.5.3 mox>=0.5.3

View File

@ -19,6 +19,8 @@ commands = flake8
[flake8] [flake8]
show-source = true show-source = true
builtins = _ builtins = _
# Ignore currently failing tests for now
ignore = E265,H405
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg
[testenv:venv] [testenv:venv]