diff options
| -rwxr-xr-x | .functests | 2 | ||||
| -rw-r--r-- | .stestr.conf | 2 | ||||
| -rwxr-xr-x | .unittests | 2 | ||||
| -rw-r--r-- | test/__init__.py (renamed from tests/__init__.py) | 0 | ||||
| -rw-r--r-- | test/functional/__init__.py (renamed from tests/functional/__init__.py) | 0 | ||||
| -rw-r--r-- | test/functional/test_swiftclient.py (renamed from tests/functional/test_swiftclient.py) | 0 | ||||
| -rw-r--r-- | test/sample.conf (renamed from tests/sample.conf) | 0 | ||||
| -rw-r--r-- | test/unit/__init__.py (renamed from tests/unit/__init__.py) | 0 | ||||
| -rw-r--r-- | test/unit/test_authv1.py (renamed from tests/unit/test_authv1.py) | 0 | ||||
| -rw-r--r-- | test/unit/test_command_helpers.py (renamed from tests/unit/test_command_helpers.py) | 0 | ||||
| -rw-r--r-- | test/unit/test_multithreading.py (renamed from tests/unit/test_multithreading.py) | 0 | ||||
| -rw-r--r-- | test/unit/test_service.py (renamed from tests/unit/test_service.py) | 8 | ||||
| -rw-r--r-- | test/unit/test_shell.py (renamed from tests/unit/test_shell.py) | 0 | ||||
| -rw-r--r-- | test/unit/test_swiftclient.py (renamed from tests/unit/test_swiftclient.py) | 0 | ||||
| -rw-r--r-- | test/unit/test_utils.py (renamed from tests/unit/test_utils.py) | 0 | ||||
| -rw-r--r-- | test/unit/utils.py (renamed from tests/unit/utils.py) | 0 | ||||
| -rw-r--r-- | tox.ini | 4 |
17 files changed, 9 insertions, 9 deletions
@@ -1,7 +1,7 @@ #!/bin/bash set -e -export OS_TEST_PATH='tests.functional' +export OS_TEST_PATH='test.functional' export PYTHON='coverage run --source swiftclient --parallel-mode' stestr run --concurrency=1 diff --git a/.stestr.conf b/.stestr.conf index 5228f20..90f5b81 100644 --- a/.stestr.conf +++ b/.stestr.conf @@ -1,4 +1,4 @@ [DEFAULT] -test_path=${OS_TEST_PATH:-./tests/unit} +test_path=${OS_TEST_PATH:-./test/unit} top_dir=./ @@ -1,7 +1,7 @@ #!/bin/bash set -e -python setup.py testr --coverage --testr-args="tests.unit" +python setup.py testr --coverage --testr-args="test.unit" RET=$? coverage report -m rm -f .coverage diff --git a/tests/__init__.py b/test/__init__.py index e69de29..e69de29 100644 --- a/tests/__init__.py +++ b/test/__init__.py diff --git a/tests/functional/__init__.py b/test/functional/__init__.py index e69de29..e69de29 100644 --- a/tests/functional/__init__.py +++ b/test/functional/__init__.py diff --git a/tests/functional/test_swiftclient.py b/test/functional/test_swiftclient.py index 9a74c63..9a74c63 100644 --- a/tests/functional/test_swiftclient.py +++ b/test/functional/test_swiftclient.py diff --git a/tests/sample.conf b/test/sample.conf index 95c1a47..95c1a47 100644 --- a/tests/sample.conf +++ b/test/sample.conf diff --git a/tests/unit/__init__.py b/test/unit/__init__.py index e69de29..e69de29 100644 --- a/tests/unit/__init__.py +++ b/test/unit/__init__.py diff --git a/tests/unit/test_authv1.py b/test/unit/test_authv1.py index 2ddf24b..2ddf24b 100644 --- a/tests/unit/test_authv1.py +++ b/test/unit/test_authv1.py diff --git a/tests/unit/test_command_helpers.py b/test/unit/test_command_helpers.py index 24684ae..24684ae 100644 --- a/tests/unit/test_command_helpers.py +++ b/test/unit/test_command_helpers.py diff --git a/tests/unit/test_multithreading.py b/test/unit/test_multithreading.py index 8944d48..8944d48 100644 --- a/tests/unit/test_multithreading.py +++ b/test/unit/test_multithreading.py diff --git a/tests/unit/test_service.py b/test/unit/test_service.py index b760352..ed3a2d6 100644 --- a/tests/unit/test_service.py +++ b/test/unit/test_service.py @@ -36,7 +36,7 @@ from swiftclient.service import ( SwiftService, SwiftError, SwiftUploadObject ) -from tests.unit import utils as test_utils +from test.unit import utils as test_utils clean_os_environ = {} @@ -1060,11 +1060,11 @@ class TestService(unittest.TestCase): @mock.patch('swiftclient.service.getsize', return_value=4) def test_upload_with_relative_path(self, *args, **kwargs): service = SwiftService({}) - objects = [{'path': "./test", + objects = [{'path': "./testobj", 'strt_indx': 2}, - {'path': os.path.join(os.getcwd(), "test"), + {'path': os.path.join(os.getcwd(), "testobj"), 'strt_indx': 1}, - {'path': ".\\test", + {'path': ".\\testobj", 'strt_indx': 2}] for obj in objects: with mock.patch('swiftclient.service.Connection') as mock_conn, \ diff --git a/tests/unit/test_shell.py b/test/unit/test_shell.py index c972281..c972281 100644 --- a/tests/unit/test_shell.py +++ b/test/unit/test_shell.py diff --git a/tests/unit/test_swiftclient.py b/test/unit/test_swiftclient.py index 2d45deb..2d45deb 100644 --- a/tests/unit/test_swiftclient.py +++ b/test/unit/test_swiftclient.py diff --git a/tests/unit/test_utils.py b/test/unit/test_utils.py index 97abc44..97abc44 100644 --- a/tests/unit/test_utils.py +++ b/test/unit/test_utils.py diff --git a/tests/unit/utils.py b/test/unit/utils.py index 025a234..025a234 100644 --- a/tests/unit/utils.py +++ b/test/unit/utils.py @@ -24,7 +24,7 @@ passenv = SWIFT_* *_proxy [testenv:pep8] basepython = python3 commands = - python -m flake8 swiftclient tests + python -m flake8 swiftclient test [testenv:venv] basepython = python3 @@ -44,7 +44,7 @@ commands = [testenv:func] basepython = python3 setenv = - OS_TEST_PATH=tests.functional + OS_TEST_PATH=test.functional PYTHON=coverage run --source swiftclient --parallel-mode whitelist_externals = coverage |