Merge "Use tempest.lib instead of tempest-lib"

openstack · Mar 3, 2016 · 216e78e · 216e78e
2 parents 16bb44a + cea9ada
commit 216e78e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/neutron_fwaas/tests/tempest_plugin/services/client.py b/neutron_fwaas/tests/tempest_plugin/services/client.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tempest_lib import exceptions as lib_exc
+from tempest.lib import exceptions as lib_exc
 
 from tempest.services.network.json import base
 

diff --git a/neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaas_extensions.py b/neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaas_extensions.py
@@ -13,11 +13,11 @@
 #    under the License.
 
 import six
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from tempest import config
 from tempest import exceptions
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
 
 from neutron_fwaas.tests.tempest_plugin.tests.api import base

diff --git a/neutron_fwaas/tests/tempest_plugin/tests/fwaas_client.py b/neutron_fwaas/tests/tempest_plugin/tests/fwaas_client.py
@@ -15,11 +15,10 @@
 
 import time
 
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
-
 from tempest import config
 from tempest import exceptions
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 
 from neutron.plugins.common import constants as p_const
 

diff --git a/neutron_fwaas/tests/tempest_plugin/tests/scenario/base.py b/neutron_fwaas/tests/tempest_plugin/tests/scenario/base.py
@@ -13,10 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tempest_lib.common import ssh
-from tempest_lib import exceptions as lib_exc
-
 from tempest import config
+from tempest.lib.common import ssh
+from tempest.lib import exceptions as lib_exc
 from tempest.scenario import manager
 
 from neutron_fwaas.tests.tempest_plugin.tests import fwaas_client