diff --git a/.gitreview b/.gitreview index 698048f..1d3d643 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] host=review.openstack.org port=29418 -project=openstack/openstack.git +project=openstack/zaqar-tempest-plugin.git diff --git a/README.rst b/README.rst index 33cdf3b..36fb51b 100644 --- a/README.rst +++ b/README.rst @@ -1,19 +1,12 @@ -=============================== -openstack -=============================== +==================== +Zaqar Tempest Plugin +==================== -Tempest plugin zaqar_tempest_plugin +Tempest plugin for Zaqar project. -Please fill here a long description which must be at least 3 lines wrapped on -80 cols, so that distribution package maintainers can use it in their packages. -Note that this is a hard requirement. +It contains the tempest plugin for the functional testing of Zaqar Project. * Free software: Apache license -* Documentation: http://docs.openstack.org/developer/openstack -* Source: http://git.openstack.org/cgit/openstack/openstack -* Bugs: http://bugs.launchpad.net/zaqar_tempest_plugin - -Features --------- - -* TODO +* Documentation: http://docs.openstack.org/developer/zaqar +* Source: http://git.openstack.org/cgit/openstack/zaqar-tempest-plugin +* Bugs: http://bugs.launchpad.net/zaqar diff --git a/setup.cfg b/setup.cfg index b7cf7dd..88df0fe 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = openstack +name = zaqar_tempest_plugin summary = Tempest plugin zaqar_tempest_plugin description-file = README.rst @@ -21,7 +21,7 @@ classifier = [files] packages = - zaqar + zaqar_tempest_plugin [build_sphinx] all-files = 1 @@ -33,19 +33,19 @@ build-dir = doc/build upload-dir = doc/build/html [compile_catalog] -directory = zaqar/locale -domain = zaqar +directory = zaqar_tempest_plugin/locale +domain = zaqar_tempest_plugin [update_catalog] -domain = zaqar -output_dir = zaqar/locale -input_file = zaqar/locale/zaqar_tempest_plugin.pot +domain = zaqar_tempest_plugin +output_dir = zaqar_tempest_plugin/locale +input_file = zaqar_tempest_plugin/locale/zaqar_tempest_plugin.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = zaqar/locale/zaqar_tempest_plugin.pot +output_file = zaqar_tempest_plugin/locale/zaqar_tempest_plugin.pot [entry_points] tempest.test_plugins = - zaqar_tests = zaqar.tests.tempest_plugin.plugin:ZaqarTempestPlugin + zaqar_tests = zaqar_tempest_plugin.plugin:ZaqarTempestPlugin diff --git a/tox.ini b/tox.ini index c888992..0840cf8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py34,py27,pypy,pep8 +envlist = py35,py27,pypy,pep8 skipsdist = True [testenv] @@ -9,7 +9,8 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstac setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning -deps = -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = python setup.py test --slowest --testr-args='{posargs}' [testenv:pep8] diff --git a/zaqar/tests/tempest_plugin/tests/v1_1/__init__.py b/zaqar/tests/tempest_plugin/tests/v1_1/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/zaqar/tests/tempest_plugin/tests/v2/__init__.py b/zaqar/tests/tempest_plugin/tests/v2/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/zaqar/__init__.py b/zaqar_tempest_plugin/__init__.py similarity index 100% rename from zaqar/__init__.py rename to zaqar_tempest_plugin/__init__.py diff --git a/zaqar/tests/__init__.py b/zaqar_tempest_plugin/api_schema/__init__.py similarity index 100% rename from zaqar/tests/__init__.py rename to zaqar_tempest_plugin/api_schema/__init__.py diff --git a/zaqar/tests/tempest_plugin/__init__.py b/zaqar_tempest_plugin/api_schema/response/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/__init__.py rename to zaqar_tempest_plugin/api_schema/response/__init__.py diff --git a/zaqar/tests/tempest_plugin/api_schema/__init__.py b/zaqar_tempest_plugin/api_schema/response/v1/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/api_schema/__init__.py rename to zaqar_tempest_plugin/api_schema/response/v1/__init__.py diff --git a/zaqar/tests/tempest_plugin/api_schema/response/v1/queues.py b/zaqar_tempest_plugin/api_schema/response/v1/queues.py similarity index 100% rename from zaqar/tests/tempest_plugin/api_schema/response/v1/queues.py rename to zaqar_tempest_plugin/api_schema/response/v1/queues.py diff --git a/zaqar/tests/tempest_plugin/api_schema/response/__init__.py b/zaqar_tempest_plugin/api_schema/response/v1_1/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/api_schema/response/__init__.py rename to zaqar_tempest_plugin/api_schema/response/v1_1/__init__.py diff --git a/zaqar/tests/tempest_plugin/api_schema/response/v1_1/queues.py b/zaqar_tempest_plugin/api_schema/response/v1_1/queues.py similarity index 100% rename from zaqar/tests/tempest_plugin/api_schema/response/v1_1/queues.py rename to zaqar_tempest_plugin/api_schema/response/v1_1/queues.py diff --git a/zaqar/tests/tempest_plugin/api_schema/response/v1/__init__.py b/zaqar_tempest_plugin/api_schema/response/v2/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/api_schema/response/v1/__init__.py rename to zaqar_tempest_plugin/api_schema/response/v2/__init__.py diff --git a/zaqar/tests/tempest_plugin/api_schema/response/v2/queues.py b/zaqar_tempest_plugin/api_schema/response/v2/queues.py similarity index 100% rename from zaqar/tests/tempest_plugin/api_schema/response/v2/queues.py rename to zaqar_tempest_plugin/api_schema/response/v2/queues.py diff --git a/zaqar/tests/tempest_plugin/config.py b/zaqar_tempest_plugin/config.py similarity index 100% rename from zaqar/tests/tempest_plugin/config.py rename to zaqar_tempest_plugin/config.py diff --git a/zaqar/tests/tempest_plugin/plugin.py b/zaqar_tempest_plugin/plugin.py similarity index 86% rename from zaqar/tests/tempest_plugin/plugin.py rename to zaqar_tempest_plugin/plugin.py index 70ffad4..ea3c01a 100644 --- a/zaqar/tests/tempest_plugin/plugin.py +++ b/zaqar_tempest_plugin/plugin.py @@ -18,17 +18,14 @@ import os from tempest.test_discover import plugins -from zaqar.tests.tempest_plugin import config as zaqar_config +from zaqar_tempest_plugin import config as zaqar_config class ZaqarTempestPlugin(plugins.TempestPlugin): def load_tests(self): base_path = os.path.split(os.path.dirname( os.path.abspath(__file__)))[0] - # Note: base_path should be set to the top directory - # of zaqar. - base_path += '/../..' - test_dir = "zaqar/tests/tempest_plugin/tests" + test_dir = "zaqar_tempest_plugin/tests" full_test_dir = os.path.join(base_path, test_dir) return full_test_dir, base_path diff --git a/zaqar/tests/tempest_plugin/api_schema/response/v1_1/__init__.py b/zaqar_tempest_plugin/services/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/api_schema/response/v1_1/__init__.py rename to zaqar_tempest_plugin/services/__init__.py diff --git a/zaqar/tests/tempest_plugin/api_schema/response/v2/__init__.py b/zaqar_tempest_plugin/services/messaging/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/api_schema/response/v2/__init__.py rename to zaqar_tempest_plugin/services/messaging/__init__.py diff --git a/zaqar/tests/tempest_plugin/services/__init__.py b/zaqar_tempest_plugin/services/messaging/json/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/services/__init__.py rename to zaqar_tempest_plugin/services/messaging/json/__init__.py diff --git a/zaqar/tests/tempest_plugin/services/messaging/json/messaging_client.py b/zaqar_tempest_plugin/services/messaging/json/messaging_client.py similarity index 99% rename from zaqar/tests/tempest_plugin/services/messaging/json/messaging_client.py rename to zaqar_tempest_plugin/services/messaging/json/messaging_client.py index 9f3a44b..c497ac4 100644 --- a/zaqar/tests/tempest_plugin/services/messaging/json/messaging_client.py +++ b/zaqar_tempest_plugin/services/messaging/json/messaging_client.py @@ -19,11 +19,11 @@ from oslo_serialization import jsonutils as json from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client -from zaqar.tests.tempest_plugin.api_schema.response.v1 \ +from zaqar_tempest_plugin.api_schema.response.v1 \ import queues as v1schema -from zaqar.tests.tempest_plugin.api_schema.response.v1_1 \ +from zaqar_tempest_plugin.api_schema.response.v1_1 \ import queues as v11schema -from zaqar.tests.tempest_plugin.api_schema.response.v2 \ +from zaqar_tempest_plugin.api_schema.response.v2 \ import queues as v2schema diff --git a/zaqar/tests/tempest_plugin/services/messaging/__init__.py b/zaqar_tempest_plugin/tests/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/services/messaging/__init__.py rename to zaqar_tempest_plugin/tests/__init__.py diff --git a/zaqar/tests/tempest_plugin/tests/base.py b/zaqar_tempest_plugin/tests/base.py similarity index 99% rename from zaqar/tests/tempest_plugin/tests/base.py rename to zaqar_tempest_plugin/tests/base.py index b174ff0..044203c 100644 --- a/zaqar/tests/tempest_plugin/tests/base.py +++ b/zaqar_tempest_plugin/tests/base.py @@ -17,7 +17,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest import test -from zaqar.tests.tempest_plugin.services.messaging.json import messaging_client +from zaqar_tempest_plugin.services.messaging.json import messaging_client CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/services/messaging/json/__init__.py b/zaqar_tempest_plugin/tests/v1/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/services/messaging/json/__init__.py rename to zaqar_tempest_plugin/tests/v1/__init__.py diff --git a/zaqar/tests/tempest_plugin/tests/v1/test_claims.py b/zaqar_tempest_plugin/tests/v1/test_claims.py similarity index 98% rename from zaqar/tests/tempest_plugin/tests/v1/test_claims.py rename to zaqar_tempest_plugin/tests/v1/test_claims.py index 6a3499b..b54f972 100644 --- a/zaqar/tests/tempest_plugin/tests/v1/test_claims.py +++ b/zaqar_tempest_plugin/tests/v1/test_claims.py @@ -18,7 +18,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/tests/v1/test_messages.py b/zaqar_tempest_plugin/tests/v1/test_messages.py similarity index 98% rename from zaqar/tests/tempest_plugin/tests/v1/test_messages.py rename to zaqar_tempest_plugin/tests/v1/test_messages.py index 27e6def..5da4d1a 100644 --- a/zaqar/tests/tempest_plugin/tests/v1/test_messages.py +++ b/zaqar_tempest_plugin/tests/v1/test_messages.py @@ -17,7 +17,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/tests/v1/test_queues.py b/zaqar_tempest_plugin/tests/v1/test_queues.py similarity index 98% rename from zaqar/tests/tempest_plugin/tests/v1/test_queues.py rename to zaqar_tempest_plugin/tests/v1/test_queues.py index afda1b3..313d10c 100644 --- a/zaqar/tests/tempest_plugin/tests/v1/test_queues.py +++ b/zaqar_tempest_plugin/tests/v1/test_queues.py @@ -20,7 +20,7 @@ from tempest.lib import decorators from tempest.lib import exceptions as lib_exc from testtools import matchers -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base class TestQueues(base.BaseV1MessagingTest): diff --git a/zaqar/tests/tempest_plugin/tests/__init__.py b/zaqar_tempest_plugin/tests/v1_1/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/tests/__init__.py rename to zaqar_tempest_plugin/tests/v1_1/__init__.py diff --git a/zaqar/tests/tempest_plugin/tests/v1_1/test_claims.py b/zaqar_tempest_plugin/tests/v1_1/test_claims.py similarity index 98% rename from zaqar/tests/tempest_plugin/tests/v1_1/test_claims.py rename to zaqar_tempest_plugin/tests/v1_1/test_claims.py index fde4fbc..40cc769 100644 --- a/zaqar/tests/tempest_plugin/tests/v1_1/test_claims.py +++ b/zaqar_tempest_plugin/tests/v1_1/test_claims.py @@ -18,7 +18,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/tests/v1_1/test_messages.py b/zaqar_tempest_plugin/tests/v1_1/test_messages.py similarity index 98% rename from zaqar/tests/tempest_plugin/tests/v1_1/test_messages.py rename to zaqar_tempest_plugin/tests/v1_1/test_messages.py index 8d039d5..cfac976 100644 --- a/zaqar/tests/tempest_plugin/tests/v1_1/test_messages.py +++ b/zaqar_tempest_plugin/tests/v1_1/test_messages.py @@ -18,7 +18,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/tests/v1_1/test_queues.py b/zaqar_tempest_plugin/tests/v1_1/test_queues.py similarity index 98% rename from zaqar/tests/tempest_plugin/tests/v1_1/test_queues.py rename to zaqar_tempest_plugin/tests/v1_1/test_queues.py index 27f7152..d906429 100644 --- a/zaqar/tests/tempest_plugin/tests/v1_1/test_queues.py +++ b/zaqar_tempest_plugin/tests/v1_1/test_queues.py @@ -18,7 +18,7 @@ from six import moves from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base class TestQueues(base.BaseV11MessagingTest): diff --git a/zaqar/tests/tempest_plugin/tests/v1/__init__.py b/zaqar_tempest_plugin/tests/v2/__init__.py similarity index 100% rename from zaqar/tests/tempest_plugin/tests/v1/__init__.py rename to zaqar_tempest_plugin/tests/v2/__init__.py diff --git a/zaqar/tests/tempest_plugin/tests/v2/test_claims.py b/zaqar_tempest_plugin/tests/v2/test_claims.py similarity index 99% rename from zaqar/tests/tempest_plugin/tests/v2/test_claims.py rename to zaqar_tempest_plugin/tests/v2/test_claims.py index 422b94f..a4fdbf4 100644 --- a/zaqar/tests/tempest_plugin/tests/v2/test_claims.py +++ b/zaqar_tempest_plugin/tests/v2/test_claims.py @@ -20,7 +20,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/tests/v2/test_claims_negative.py b/zaqar_tempest_plugin/tests/v2/test_claims_negative.py similarity index 99% rename from zaqar/tests/tempest_plugin/tests/v2/test_claims_negative.py rename to zaqar_tempest_plugin/tests/v2/test_claims_negative.py index 6f51f6a..44dd8a5 100644 --- a/zaqar/tests/tempest_plugin/tests/v2/test_claims_negative.py +++ b/zaqar_tempest_plugin/tests/v2/test_claims_negative.py @@ -20,7 +20,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/tests/v2/test_messages.py b/zaqar_tempest_plugin/tests/v2/test_messages.py similarity index 98% rename from zaqar/tests/tempest_plugin/tests/v2/test_messages.py rename to zaqar_tempest_plugin/tests/v2/test_messages.py index fe322e3..d6a769b 100644 --- a/zaqar/tests/tempest_plugin/tests/v2/test_messages.py +++ b/zaqar_tempest_plugin/tests/v2/test_messages.py @@ -18,7 +18,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/tests/v2/test_messages_negative.py b/zaqar_tempest_plugin/tests/v2/test_messages_negative.py similarity index 99% rename from zaqar/tests/tempest_plugin/tests/v2/test_messages_negative.py rename to zaqar_tempest_plugin/tests/v2/test_messages_negative.py index a40aa01..a3d856e 100644 --- a/zaqar/tests/tempest_plugin/tests/v2/test_messages_negative.py +++ b/zaqar_tempest_plugin/tests/v2/test_messages_negative.py @@ -22,7 +22,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/tests/v2/test_queues.py b/zaqar_tempest_plugin/tests/v2/test_queues.py similarity index 99% rename from zaqar/tests/tempest_plugin/tests/v2/test_queues.py rename to zaqar_tempest_plugin/tests/v2/test_queues.py index 71dca37..86621a3 100644 --- a/zaqar/tests/tempest_plugin/tests/v2/test_queues.py +++ b/zaqar_tempest_plugin/tests/v2/test_queues.py @@ -20,7 +20,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from testtools import matchers -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF diff --git a/zaqar/tests/tempest_plugin/tests/v2/test_queues_negative.py b/zaqar_tempest_plugin/tests/v2/test_queues_negative.py similarity index 99% rename from zaqar/tests/tempest_plugin/tests/v2/test_queues_negative.py rename to zaqar_tempest_plugin/tests/v2/test_queues_negative.py index 65a43e2..7156f52 100644 --- a/zaqar/tests/tempest_plugin/tests/v2/test_queues_negative.py +++ b/zaqar_tempest_plugin/tests/v2/test_queues_negative.py @@ -18,7 +18,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base class QueueNegativeTestJSON(base.BaseV2MessagingTest): diff --git a/zaqar/tests/tempest_plugin/tests/v2/test_subscriptions.py b/zaqar_tempest_plugin/tests/v2/test_subscriptions.py similarity index 99% rename from zaqar/tests/tempest_plugin/tests/v2/test_subscriptions.py rename to zaqar_tempest_plugin/tests/v2/test_subscriptions.py index 4d6f4f7..8a3b34a 100644 --- a/zaqar/tests/tempest_plugin/tests/v2/test_subscriptions.py +++ b/zaqar_tempest_plugin/tests/v2/test_subscriptions.py @@ -20,7 +20,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base class TestSubscriptions(base.BaseV2MessagingTest): diff --git a/zaqar/tests/tempest_plugin/tests/v2/test_subscriptions_negative.py b/zaqar_tempest_plugin/tests/v2/test_subscriptions_negative.py similarity index 99% rename from zaqar/tests/tempest_plugin/tests/v2/test_subscriptions_negative.py rename to zaqar_tempest_plugin/tests/v2/test_subscriptions_negative.py index a836752..36c83b5 100644 --- a/zaqar/tests/tempest_plugin/tests/v2/test_subscriptions_negative.py +++ b/zaqar_tempest_plugin/tests/v2/test_subscriptions_negative.py @@ -20,7 +20,7 @@ from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc -from zaqar.tests.tempest_plugin.tests import base +from zaqar_tempest_plugin.tests import base CONF = config.CONF