From 253294f0b578f669ce3d2c71e92e43c7d0cc8259 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Mon, 27 Aug 2018 00:58:58 +0900
Subject: [PATCH] Drop nose dependencies

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.

The command line to invoke UT in tox.ini is updated accordingly:
* --ignore-files=masakaridashboard/test/uuidsentinel.py is unnecessary
  as this file does not include test cases.
* --verbosity 2 is added to watch the test progress.
* Duplicated {posargs} in 'coverage' env is fixed.
* --exclude-dir in 'coverage' env is dropped as the corresponding
  directory does not exist.

Change-Id: I28b97f49ba480d2cbada36026e5bc6932213c689
---
 requirements.txt      | 2 +-
 test-requirements.txt | 6 ------
 tox.ini               | 6 +++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b1d58f4..95dfb7c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,6 +10,6 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 # Horizon Core Requirements
-horizon>=13.0.0  # Apache-2.0
+horizon>=14.0.0.0b3  # Apache-2.0
 openstacksdk>=0.13.0
 PyYAML>=3.12 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index a6e9896..a81a07a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,14 +11,8 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
 # Testing Requirements
 coverage!=4.4,>=4.0 # Apache-2.0
-django-nose>=1.4.4 # BSD
 mock>=2.0.0 # BSD
 mox3>=0.20.0  # Apache-2.0
 nodeenv>=0.9.4 # BSD
-nose>=1.3.7 # LGPL
-nose-exclude>=0.3.0 # LGPL
-nosexcover>=1.0.10 # BSD
-openstack.nose-plugin>=0.7 # Apache-2.0
-nosehtmloutput>=0.0.3 # Apache-2.0
 selenium>=2.50.1 # Apache-2.0
 xvfbwrapper>=0.1.3 #license: MIT
diff --git a/tox.ini b/tox.ini
index d6af615..64a9c2f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-commands = python manage.py test {posargs} --settings=masakaridashboard.test.settings
+commands = python manage.py test {posargs} --settings=masakaridashboard.test.settings --verbosity 2
 
 [testenv:pep8]
 commands = flake8 {posargs}
@@ -28,7 +28,7 @@ commands = {posargs}
 [testenv:cover]
 commands =
   coverage erase
-  coverage run {toxinidir}/manage.py test masakaridashboard --settings=masakaridashboard.test.settings {posargs} --exclude-dir=masakaridashboard/test/integration_tests {posargs}
+  coverage run {toxinidir}/manage.py test masakaridashboard --settings=masakaridashboard.test.settings {posargs}
   coverage xml --omit '.tox/cover/*' -o 'cover/coverage.xml'
   coverage html --omit '.tox/cover/*' -d 'cover/htmlcov'
 
@@ -36,7 +36,7 @@ commands =
 basepython = python2.7
 commands =
     pip install django>=1.8,<1.9
-    python manage.py test {posargs} --settings=masakaridashboard.test.settings
+    {[testenv]commands}
 
 [testenv:eslint]
 whitelist_externals = npm