From c7cdc4da763ef676e1eb878bd817f3edfb0bfa2d Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Fri, 17 Aug 2018 00:39:05 +0900
Subject: [PATCH] Switch test runner to django default runner

nose is not actively maintained now and Django default test runner
seems to have enough features.

* Horizon test setting no longer depends on nose and related stuffs.
  This commit cleans up nose related dependencies.
  The change was made in horizon Rocky-3,
  so horizon 14.0.0.0b3 is required at least.
* Integraion tests is marked via django.test.tag mechanism which is
  introduced in Django 1.10.
* Rename filename of test files to names starting with 'test_'
  so that the django test runner can find tests expectedly.

Change-Id: I51373a7df9686e894f5deed34db955189299fa77
---
 lower-constraints.txt                                      | 5 +----
 requirements.txt                                           | 2 +-
 test-requirements.txt                                      | 2 --
 tox.ini                                                    | 7 +------
 .../test/api_tests/{watcher_tests.py => test_watcher.py}   | 0
 ...template_panel_test.py => test_audit_template_panel.py} | 0
 watcher_dashboard/test/settings.py                         | 3 ---
 .../test/{formset_table_tests.py => test_formset_table.py} | 0
 8 files changed, 3 insertions(+), 16 deletions(-)
 rename watcher_dashboard/test/api_tests/{watcher_tests.py => test_watcher.py} (100%)
 rename watcher_dashboard/test/integration_tests/tests/{audit_template_panel_test.py => test_audit_template_panel.py} (100%)
 rename watcher_dashboard/test/{formset_table_tests.py => test_formset_table.py} (100%)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index ecf33df..81de657 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -17,7 +17,6 @@ Django==1.11.11
 django-appconf==1.0.2
 django-babel==0.6.2
 django-compressor==2.2
-django-nose==1.4.4
 django-pyscss==2.0.2
 docutils==0.14
 dogpile.cache==0.6.5
@@ -28,7 +27,7 @@ fixtures==3.0.0
 flake8==2.5.5
 futurist==1.6.0
 hacking==0.12.0
-horizon==14.0.0.b2
+horizon==14.0.0.b3
 httplib2==0.10.3
 idna==2.6
 imagesize==1.0.0
@@ -48,8 +47,6 @@ msgpack==0.5.6
 munch==2.2.0
 netaddr==0.7.19
 netifaces==0.10.6
-nose==1.3.7
-nose-exclude==0.5.0
 openstackdocstheme==1.18.1
 openstacksdk==0.12.0
 os-client-config==1.29.0
diff --git a/requirements.txt b/requirements.txt
index 9375138..ba527db 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
-horizon>=14.0.0.0b2 # Apache-2.0
+horizon>=14.0.0.0b3 # Apache-2.0
 
 PyYAML>=3.12 # MIT
 python-watcherclient>=1.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index b495449..feabb03 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,9 +5,7 @@
 
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
-django-nose>=1.4.4 # BSD
 mock>=2.0.0 # BSD
-nose-exclude>=0.5.0 # LGPL
 python-subunit>=1.0.0 # Apache-2.0/BSD
 selenium>=2.50.1 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index e99a644..4119c88 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,11 +6,6 @@ skipsdist = True
 [testenv]
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
-         NOSE_WITH_OPENSTACK=1
-         NOSE_OPENSTACK_COLOR=1
-         NOSE_OPENSTACK_RED=0.05
-         NOSE_OPENSTACK_YELLOW=0.025
-         NOSE_OPENSTACK_SHOW_ELAPSED=1
          DJANGO_SETTINGS_MODULE=watcher_dashboard.test.settings
 # Note the hash seed is set to 0 until horizon can be tested with a
 # random hash seed successfully.
@@ -27,7 +22,7 @@ commands =
     find . -type f -name "*.pyc" -delete
     find . -type d -name "__pycache__" -delete
     python manage.py test --settings=watcher_dashboard.test.settings \
-        --exclude-dir=watcher_dashboard/test/integration_tests \
+        --exclude-tag integration \
         watcher_dashboard
 
 [testenv:pep8]
diff --git a/watcher_dashboard/test/api_tests/watcher_tests.py b/watcher_dashboard/test/api_tests/test_watcher.py
similarity index 100%
rename from watcher_dashboard/test/api_tests/watcher_tests.py
rename to watcher_dashboard/test/api_tests/test_watcher.py
diff --git a/watcher_dashboard/test/integration_tests/tests/audit_template_panel_test.py b/watcher_dashboard/test/integration_tests/tests/test_audit_template_panel.py
similarity index 100%
rename from watcher_dashboard/test/integration_tests/tests/audit_template_panel_test.py
rename to watcher_dashboard/test/integration_tests/tests/test_audit_template_panel.py
diff --git a/watcher_dashboard/test/settings.py b/watcher_dashboard/test/settings.py
index 7c7206c..28be2ab 100644
--- a/watcher_dashboard/test/settings.py
+++ b/watcher_dashboard/test/settings.py
@@ -21,7 +21,6 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.messages',
     'django.contrib.humanize',
-    'django_nose',
     'openstack_auth',
     'compressor',
     'horizon',
@@ -32,8 +31,6 @@ INSTALLED_APPS = (
 import openstack_dashboard.enabled
 import watcher_dashboard.local.enabled
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-
 INSTALLED_APPS = list(INSTALLED_APPS)  # Make sure it's mutable
 settings_utils.update_dashboards(
     [
diff --git a/watcher_dashboard/test/formset_table_tests.py b/watcher_dashboard/test/test_formset_table.py
similarity index 100%
rename from watcher_dashboard/test/formset_table_tests.py
rename to watcher_dashboard/test/test_formset_table.py