Merge "move all functional tests to tests module"

Author: Jenkins

functional/tests/volume/v1/__init__.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from functional.common import test
+from openstackclient.tests.functional import base
 
 
-class AvailabilityZoneTests(test.TestCase):
+class AvailabilityZoneTests(base.TestCase):
     """Functional tests for availability zone. """
     HEADERS = ["'Zone Name'"]
     # So far, all components have the same default availability zone name.

functional/tests/volume/v2/__init__.py

@@ -12,14 +12,14 @@
 
 import os
 
-from functional.common import test
 from openstackclient.common import configuration
+from openstackclient.tests.functional import base
 
 
 BASIC_CONFIG_HEADERS = ['Field', 'Value']
 
 
-class ConfigurationTests(test.TestCase):
+class ConfigurationTests(base.TestCase):
 
     opts = "-f value -c auth.password"
 

functional/__init__.py …stackclient/tests/functional/__init__.pyfunctional/__init__.py renamed to openstackclient/tests/functional/__init__.py functional/__init__.py renamed to openstackclient/tests/functional/__init__.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from functional.common import test
+from openstackclient.tests.functional import base
 
 
-class HelpTests(test.TestCase):
+class HelpTests(base.TestCase):
     """Functional tests for openstackclient help output."""
 
     SERVER_COMMANDS = [

functional/common/test.py openstackclient/tests/functional/base.pyfunctional/common/test.py renamed to openstackclient/tests/functional/base.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from functional.common import test
+from openstackclient.tests.functional import base
 
 
-class QuotaTests(test.TestCase):
+class QuotaTests(base.TestCase):
     """Functional tests for quota. """
     # Test quota information for compute, network and volume.
     EXPECTED_FIELDS = ['instances', 'networks', 'volumes']