openstack/barbican
Code Issues Proposed changes

Merge "Make tests in test_hrefs, test_quota py3 compatible"

Browse Source
This commit is contained in:
Jenkins 2015-08-31 15:29:28 +00:00 committed by Gerrit Code Review
commit cb48973afd
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
barbican/common/exception.py
View File

@ -17,18 +17,11 @@
Barbican exception subclasses Barbican exception subclasses
""" """
import urlparse
from barbican import i18n as u from barbican import i18n as u
_FATAL_EXCEPTION_FORMAT_ERRORS = False _FATAL_EXCEPTION_FORMAT_ERRORS = False
class RedirectException(Exception):
def __init__(self, url):
self.url = urlparse.urlparse(url)
class BarbicanException(Exception): class BarbicanException(Exception):
"""Base Barbican Exception """Base Barbican Exception

4
barbican/tests/utils.py
View File

@ -17,12 +17,12 @@ import functools
from os import path from os import path
import time import time
import types import types
import urlparse
import uuid import uuid
import mock import mock
import oslotest.base as oslotest import oslotest.base as oslotest
import six import six
from six.moves.urllib import parse
import webtest import webtest
from OpenSSL import crypto from OpenSSL import crypto
@ -408,7 +408,7 @@ def create_timestamp_w_tz_and_offset(timezone=None, days=0, hours=0, minutes=0,
def get_limit_and_offset_from_ref(ref): def get_limit_and_offset_from_ref(ref):
matches = dict(urlparse.parse_qsl(urlparse.urlparse(ref).query)) matches = dict(parse.parse_qsl(parse.urlparse(ref).query))
ref_limit = matches['limit'] ref_limit = matches['limit']
ref_offset = matches['offset'] ref_offset = matches['offset']

4
tox.ini
View File

@ -27,7 +27,9 @@ deps = -r{toxinidir}/requirements.txt
commands = commands =
python -m testtools.run \ python -m testtools.run \
barbican.tests.common.test_utils barbican.tests.common.test_utils \
barbican.tests.common.test_hrefs \
barbican.tests.common.test_quota
[testenv:pep8] [testenv:pep8]
sitepackages = False sitepackages = False