Move unit tests into unit test directory
In order to pave the way for functional testing, move existing unit tests into a directory labeled unit. A subsequent patch will add a directory for functional tests. Change-Id: I08e592c328104139386b1199cdc9c3aa9841805f
This commit is contained in:
parent
1bb107cf0d
commit
5aadf96d05
@ -2,6 +2,6 @@
|
|||||||
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
||||||
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
||||||
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
|
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
|
||||||
${PYTHON:-python} -m subunit.run discover $DISCOVER_DIRECTORY $LISTOPT $IDOPTION
|
${PYTHON:-python} -m subunit.run discover -t ./ ./muranoclient/tests $LISTOPT $IDOPTION
|
||||||
test_id_option=--load-list $IDFILE
|
test_id_option=--load-list $IDFILE
|
||||||
test_list_option=--list
|
test_list_option=--list
|
||||||
|
0
muranoclient/tests/unit/__init__.py
Normal file
0
muranoclient/tests/unit/__init__.py
Normal file
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
@ -19,7 +19,7 @@ import testtools
|
|||||||
|
|
||||||
from muranoclient.common import exceptions as exc
|
from muranoclient.common import exceptions as exc
|
||||||
from muranoclient.common import http
|
from muranoclient.common import http
|
||||||
from muranoclient.tests import fakes
|
from muranoclient.tests.unit import fakes
|
||||||
|
|
||||||
|
|
||||||
@mock.patch('muranoclient.common.http.requests.request')
|
@mock.patch('muranoclient.common.http.requests.request')
|
@ -16,7 +16,7 @@ import os
|
|||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
from muranoclient.openstack.common.apiclient import exceptions
|
from muranoclient.openstack.common.apiclient import exceptions
|
||||||
from muranoclient.tests import base
|
from muranoclient.tests.unit import base
|
||||||
from muranoclient.v1.package_creator import hot_package
|
from muranoclient.v1.package_creator import hot_package
|
||||||
from muranoclient.v1.package_creator import mpl_package
|
from muranoclient.v1.package_creator import mpl_package
|
||||||
|
|
@ -31,8 +31,8 @@ from muranoclient.common import exceptions as common_exceptions
|
|||||||
from muranoclient.common import utils
|
from muranoclient.common import utils
|
||||||
from muranoclient.openstack.common.apiclient import exceptions
|
from muranoclient.openstack.common.apiclient import exceptions
|
||||||
import muranoclient.shell
|
import muranoclient.shell
|
||||||
from muranoclient.tests import base
|
from muranoclient.tests.unit import base
|
||||||
from muranoclient.tests import test_utils
|
from muranoclient.tests.unit import test_utils
|
||||||
from muranoclient.v1 import shell as v1_shell
|
from muranoclient.v1 import shell as v1_shell
|
||||||
|
|
||||||
make_pkg = test_utils.make_pkg
|
make_pkg = test_utils.make_pkg
|
5
tox.ini
5
tox.ini
@ -5,9 +5,10 @@ skipsdist = True
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
|
whitelist_externals = bash
|
||||||
install_command = pip install -U {opts} {packages}
|
install_command = pip install -U {opts} {packages}
|
||||||
setenv =
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
VIRTUAL_ENV={envdir}
|
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
Loading…
Reference in New Issue
Block a user