diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-08 01:40:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-08 01:40:56 +0000 |
| commit | d292d75f076fc5702fa5cd49e7b7024d0412bd6b (patch) | |
| tree | 97af282d1119d7ccec915704e0b6abda923fe222 | |
| parent | 0e03221473d193c52a1e83eeb67bbdb4a1506181 (diff) | |
| parent | 42af4f528ee4bbe3610f2c94a4b3cc788ebf6124 (diff) | |
| download | python-barbicanclient-d292d75f076fc5702fa5cd49e7b7024d0412bd6b.tar.gz | |
Merge "Refactor test modules"
| -rw-r--r-- | barbicanclient/tests/__init__.py (renamed from barbicanclient/test/__init__.py) | 0 | ||||
| -rw-r--r-- | barbicanclient/tests/keystone_client_fixtures.py (renamed from barbicanclient/test/keystone_client_fixtures.py) | 0 | ||||
| -rw-r--r-- | barbicanclient/tests/test_barbican.py (renamed from barbicanclient/test/test_barbican.py) | 4 | ||||
| -rw-r--r-- | barbicanclient/tests/test_client.py (renamed from barbicanclient/test/test_client.py) | 0 | ||||
| -rw-r--r-- | barbicanclient/tests/test_containers.py (renamed from barbicanclient/test/test_client_containers.py) | 2 | ||||
| -rw-r--r-- | barbicanclient/tests/test_orders.py (renamed from barbicanclient/test/test_client_orders.py) | 4 | ||||
| -rw-r--r-- | barbicanclient/tests/test_secrets.py (renamed from barbicanclient/test/test_client_secrets.py) | 2 |
7 files changed, 6 insertions, 6 deletions
diff --git a/barbicanclient/test/__init__.py b/barbicanclient/tests/__init__.py index e69de29..e69de29 100644 --- a/barbicanclient/test/__init__.py +++ b/barbicanclient/tests/__init__.py diff --git a/barbicanclient/test/keystone_client_fixtures.py b/barbicanclient/tests/keystone_client_fixtures.py index c441589..c441589 100644 --- a/barbicanclient/test/keystone_client_fixtures.py +++ b/barbicanclient/tests/keystone_client_fixtures.py diff --git a/barbicanclient/test/test_barbican.py b/barbicanclient/tests/test_barbican.py index f69d926..6d9561c 100644 --- a/barbicanclient/test/test_barbican.py +++ b/barbicanclient/tests/test_barbican.py @@ -22,8 +22,8 @@ import testtools import uuid import json -from barbicanclient.test import keystone_client_fixtures -from barbicanclient.test import test_client +from barbicanclient.tests import keystone_client_fixtures +from barbicanclient.tests import test_client import barbicanclient.barbican diff --git a/barbicanclient/test/test_client.py b/barbicanclient/tests/test_client.py index e0f6b17..e0f6b17 100644 --- a/barbicanclient/test/test_client.py +++ b/barbicanclient/tests/test_client.py diff --git a/barbicanclient/test/test_client_containers.py b/barbicanclient/tests/test_containers.py index ff2c2ad..b8a4db8 100644 --- a/barbicanclient/test/test_client_containers.py +++ b/barbicanclient/tests/test_containers.py @@ -18,7 +18,7 @@ import json import mock from oslo_utils import timeutils -from barbicanclient.test import test_client +from barbicanclient.tests import test_client from barbicanclient import base, containers, secrets diff --git a/barbicanclient/test/test_client_orders.py b/barbicanclient/tests/test_orders.py index 91866d1..34e1043 100644 --- a/barbicanclient/test/test_client_orders.py +++ b/barbicanclient/tests/test_orders.py @@ -19,8 +19,8 @@ from oslo_utils import timeutils import testtools from barbicanclient import orders, base -from barbicanclient.test import test_client -from barbicanclient.test import test_client_secrets as test_secrets +from barbicanclient.tests import test_client +from barbicanclient.tests import test_secrets class OrdersTestCase(test_client.BaseEntityResource): diff --git a/barbicanclient/test/test_client_secrets.py b/barbicanclient/tests/test_secrets.py index df526ca..abed3c2 100644 --- a/barbicanclient/test/test_client_secrets.py +++ b/barbicanclient/tests/test_secrets.py @@ -17,7 +17,7 @@ import json from oslo.utils import timeutils -from barbicanclient.test import test_client +from barbicanclient.tests import test_client from barbicanclient import secrets, base |