diff --git a/disaster_recovery/api/rest/urls.py b/disaster_recovery/api/rest/urls.py index 250d7db..667807b 100644 --- a/disaster_recovery/api/rest/urls.py +++ b/disaster_recovery/api/rest/urls.py @@ -17,7 +17,8 @@ URL patterns for the OpenStack Dashboard. """ from django.conf.urls import url -import rest_api + +from disaster_recovery.api.rest import rest_api urlpatterns = [ url(r'^api/clients/$', rest_api.Clients.as_view(), name="api_clients"), diff --git a/disaster_recovery/jobs/views.py b/disaster_recovery/jobs/views.py index 9b32b6d..a379771 100644 --- a/disaster_recovery/jobs/views.py +++ b/disaster_recovery/jobs/views.py @@ -13,9 +13,9 @@ from horizon import browsers from horizon import workflows -import workflows.create as configure_workflow -import workflows.update_job as update_job_workflow -import workflows.update_actions as update_actions_workflow +from disaster_recovery.jobs.workflows import create as configure_workflow +from disaster_recovery.jobs.workflows import update_job as update_job_workflow +from disaster_recovery.jobs.workflows import update_actions as update_workflow import disaster_recovery.api.api as freezer_api import disaster_recovery.jobs.browsers as project_browsers @@ -85,7 +85,7 @@ class EditJobWorkflowView(workflows.WorkflowView): class ActionsInJobView(workflows.WorkflowView): - workflow_class = update_actions_workflow.UpdateActions + workflow_class = update_workflow.UpdateActions @shield("Unable to get job", redirect="jobs:index") def get_object(self): diff --git a/disaster_recovery/tests/settings.py b/disaster_recovery/tests/settings.py index f24d56a..5dde909 100644 --- a/disaster_recovery/tests/settings.py +++ b/disaster_recovery/tests/settings.py @@ -32,11 +32,6 @@ TESTSERVER = 'http://testserver' MESSAGE_STORAGE = 'django.contrib.messages.storage.cookie.CookieStorage' -TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' -NOSE_ARGS = ['--nocapture', - '--nologcapture', - '--cover-package=windc'] - EMAIL_BACKEND = 'django.core.mail.backends.locmem.EmailBackend' SESSION_ENGINE = 'django.contrib.sessions.backends.cache' diff --git a/lower-constraints.txt b/lower-constraints.txt index e5f802b..5c61fb2 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -31,9 +31,11 @@ netaddr==0.7.19 nose==1.3.7 nosehtmloutput==0.0.3 nosexcover==1.0.10 +nose-exclude==0.5.0 openstack.nose-plugin==0.7 oslo.config==5.2.0 oslo.i18n==3.20.0 +oslo.log==3.36.0 oslosphinx==4.7.0 pbr==3.1.1 pep8==1.5.7 diff --git a/requirements.txt b/requirements.txt index 3543449..8fcfc11 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,7 @@ # process, which may cause wedges in the gate later. Django<2.0,>=1.11 # BSD python-freezerclient>=1.3.0 # Apache-2.0 +oslo.log # Apache-2.0 # OpenStack CI will install the following projects from git # if they are in the required-projects list for a job: diff --git a/test-requirements.txt b/test-requirements.txt index b48e2cd..6940b55 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -17,6 +17,7 @@ nosehtmloutput>=0.0.3 # Apache-2.0 openstack.nose-plugin>=0.7 # Apache-2.0 django-nose>=1.4.4 # BSD nosexcover>=1.0.10 # BSD +nose-exclude>=0.5.0 # LGPL # Horizon requirements Django<2.0,>=1.11 # BSD