Various fixes and updates

- Remove redundant test-requirements and require horizon
  Note: This implies newer versions of django

- Use openstack_dashboard.test.helpers.TestCase
  To fix the following error with py3.
  TypeError: unhashable type: 'TestNeutron_taas_dashboard'

- Update uses of urlresolvers
  See: https://review.openstack.org/#/c/528497/

- Fix ImproperlyConfigured
  See: https://review.openstack.org/#/c/527323/

Change-Id: I60e983baff48cf5bab73c5e89f03b6984ef62417
This commit is contained in:
YAMAMOTO Takashi 2019-04-04 13:13:26 +09:00
parent 7e716495bf
commit b085767b5a
10 changed files with 13 additions and 34 deletions

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from django.views.decorators.debug import sensitive_variables

View File

@ -30,5 +30,5 @@ urlpatterns = [
url(TAP_SERVICES % 'detail', views.DetailView.as_view(), name='detail'),
url(TAP_SERVICES % 'tapflows/create', tf_views.CreateView.as_view(),
name='createtapflow'),
url(r'^tapflows/', include(tapflow_urls, namespace='tapflows')),
url(r'^tapflows/', include((tapflow_urls, 'tapflows'))),
]

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from django.views.decorators.debug import sensitive_variables

View File

@ -13,9 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslotest import base
from openstack_dashboard.test import helpers
class TestCase(base.BaseTestCase):
class TestCase(helpers.TestCase):
"""Test case base class for all unit tests."""

View File

@ -8,10 +8,5 @@
#
# PBR should always appear first
pbr>=2.0.0 # Apache-2.0
# If python-higginsclient will be created, we will use it.
#python-higginsclient>=0.1.0 # Apache-2.0
Babel>=2.3.4 # BSD
Django<1.9,>=1.8 # BSD
django-babel>=0.5.1 # BSD
django-compressor>=2.0 # MIT
django-pyscss>=2.0.2 # BSD License (2 clause)
horizon>=14.0.0 # Apache-2.0
python-neutronclient>=6.7.0 # Apache-2.0

View File

@ -9,21 +9,5 @@
# Hacking should appear first in case something else depends on pep8
hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0
#
coverage>=3.6 # Apache-2.0
django-nose>=1.2 # BSD
mock>=2.0 # BSD
mox3>=0.7.0 # Apache-2.0
nodeenv>=0.9.4 # BSD License # BSD
nose # LGPL
nose-exclude # LGPL
nosehtmloutput>=0.0.3 # Apache-2.0
nosexcover # BSD
openstack.nose-plugin>=0.7 # Apache-2.0
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
reno>=1.8.0 # Apache2
selenium>=2.50.1 # Apache-2.0
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
testtools>=1.4.0 # MIT
# This also needs xvfb library installed on your OS
xvfbwrapper>=0.1.3 #license: MIT
coverage!=4.4,>=4.0 # Apache-2.0
mock>=2.0.0 # BSD