Move unit tests to standard directory

This patch moves the glanceclient unit tests to the standard directory
(xxxclient/tests/unit) in preparation for adding functional gate tests
'check-glanceclient-dsvm-functional' in the same vein as existing client
tests for other projects, eg:

* check-novaclient-dsvm-functional
* check-keystoneclient-dsvm-functional
* check-neutronclient-dsvm-functional

Change-Id: I29d4b9e3a428c851575ee9afde40d6df583456c4
This commit is contained in:
Stuart McLaren
2015-04-17 14:02:33 +00:00
parent 825c4a5df2
commit f2a8a520e7
33 changed files with 16 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
[DEFAULT] [DEFAULT]
test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION test_command=${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./glanceclient/tests/unit} $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE test_id_option=--load-list $IDFILE
test_list_option=--list test_list_option=--list

View File

@@ -27,7 +27,7 @@ import glanceclient
from glanceclient.common import http from glanceclient.common import http
from glanceclient.common import https from glanceclient.common import https
from glanceclient import exc from glanceclient import exc
from tests import utils from glanceclient.tests import utils
class TestClient(testtools.TestCase): class TestClient(testtools.TestCase):

View File

@@ -19,7 +19,7 @@ import six
import testtools import testtools
from glanceclient.common import progressbar from glanceclient.common import progressbar
from tests import utils as test_utils from glanceclient.tests import utils as test_utils
class TestProgressBarWrapper(testtools.TestCase): class TestProgressBarWrapper(testtools.TestCase):

View File

@@ -30,10 +30,10 @@ import six
from glanceclient import exc from glanceclient import exc
from glanceclient import shell as openstack_shell from glanceclient import shell as openstack_shell
from glanceclient.tests import utils
#NOTE (esheffield) Used for the schema caching tests #NOTE (esheffield) Used for the schema caching tests
from glanceclient.v2 import schemas as schemas from glanceclient.v2 import schemas as schemas
import json import json
from tests import utils
DEFAULT_IMAGE_URL = 'http://127.0.0.1:5000/' DEFAULT_IMAGE_URL = 'http://127.0.0.1:5000/'

View File

@@ -15,9 +15,9 @@
import testtools import testtools
from glanceclient.tests import utils
import glanceclient.v1.image_members import glanceclient.v1.image_members
import glanceclient.v1.images import glanceclient.v1.images
from tests import utils
fixtures = { fixtures = {

View File

@@ -20,10 +20,10 @@ import testtools
import six import six
from six.moves.urllib import parse from six.moves.urllib import parse
from glanceclient.tests import utils
from glanceclient.v1 import client from glanceclient.v1 import client
from glanceclient.v1 import images from glanceclient.v1 import images
from glanceclient.v1 import shell from glanceclient.v1 import shell
from tests import utils
fixtures = { fixtures = {

View File

@@ -31,7 +31,7 @@ import glanceclient.v1.client as client
import glanceclient.v1.images import glanceclient.v1.images
import glanceclient.v1.shell as v1shell import glanceclient.v1.shell as v1shell
from tests import utils from glanceclient.tests import utils
if six.PY3: if six.PY3:
import io import io

View File

View File

@@ -18,8 +18,8 @@ import errno
import testtools import testtools
from glanceclient import exc from glanceclient import exc
from glanceclient.tests import utils
from glanceclient.v2 import images from glanceclient.v2 import images
from tests import utils
_CHKSUM = '93264c3edf5972c9f1cb309543d38a5c' _CHKSUM = '93264c3edf5972c9f1cb309543d38a5c'
_CHKSUM1 = '54264c3edf5972c9f1cb309453d38a46' _CHKSUM1 = '54264c3edf5972c9f1cb309453d38a46'

View File

@@ -15,8 +15,8 @@
import testtools import testtools
from glanceclient.tests import utils
from glanceclient.v2 import image_members from glanceclient.v2 import image_members
from tests import utils
IMAGE = '3a4560a1-e585-443e-9b39-553b46ec92d1' IMAGE = '3a4560a1-e585-443e-9b39-553b46ec92d1'

View File

@@ -15,8 +15,8 @@
import testtools import testtools
from glanceclient.tests import utils
from glanceclient.v2 import metadefs from glanceclient.v2 import metadefs
from tests import utils
NAMESPACE1 = 'Namespace1' NAMESPACE1 = 'Namespace1'
NAMESPACE2 = 'Namespace2' NAMESPACE2 = 'Namespace2'

View File

@@ -16,8 +16,8 @@
import six import six
import testtools import testtools
from glanceclient.tests import utils
from glanceclient.v2 import metadefs from glanceclient.v2 import metadefs
from tests import utils
NAMESPACE1 = 'Namespace1' NAMESPACE1 = 'Namespace1'
OBJECT1 = 'Object1' OBJECT1 = 'Object1'

View File

@@ -15,8 +15,8 @@
import testtools import testtools
from glanceclient.tests import utils
from glanceclient.v2 import metadefs from glanceclient.v2 import metadefs
from tests import utils
NAMESPACE1 = 'Namespace1' NAMESPACE1 = 'Namespace1'
PROPERTY1 = 'Property1' PROPERTY1 = 'Property1'

View File

@@ -15,8 +15,8 @@
import testtools import testtools
from glanceclient.tests import utils
from glanceclient.v2 import metadefs from glanceclient.v2 import metadefs
from tests import utils
NAMESPACE1 = 'Namespace1' NAMESPACE1 = 'Namespace1'
RESOURCE_TYPE1 = 'ResourceType1' RESOURCE_TYPE1 = 'ResourceType1'

View File

@@ -17,8 +17,8 @@ from jsonpatch import JsonPatch
import testtools import testtools
import warlock import warlock
from glanceclient.tests import utils
from glanceclient.v2 import schemas from glanceclient.v2 import schemas
from tests import utils
fixtures = { fixtures = {

View File

@@ -15,8 +15,8 @@
import testtools import testtools
from glanceclient.tests import utils
from glanceclient.v2 import image_tags from glanceclient.v2 import image_tags
from tests import utils
IMAGE = '3a4560a1-e585-443e-9b39-553b46ec92d1' IMAGE = '3a4560a1-e585-443e-9b39-553b46ec92d1'

View File

@@ -16,8 +16,8 @@
import testtools import testtools
from glanceclient.tests import utils
from glanceclient.v2 import tasks from glanceclient.v2 import tasks
from tests import utils
_OWNED_TASK_ID = 'a4963502-acc7-42ba-ad60-5aa0962b7faf' _OWNED_TASK_ID = 'a4963502-acc7-42ba-ad60-5aa0962b7faf'