Merge "Switch test runner to django default runner"
This commit is contained in:
commit
41868c0ac6
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
7
tox.ini
7
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]
|
||||
|
|
|
@ -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(
|
||||
[
|
||||
|
|
Loading…
Reference in New Issue