commit ed7d0474ed2e41e47f00d492906e30cb655ab898
author Jenkins <jenkins@review.openstack.org> Wed Dec 07 13:14:26 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Dec 07 13:14:26 2016 +0000
tree f7a6df8c84b56592f132ce6666ef34275b0b3fdf
parent 6912b893068ab5ec19982cf6a776d650d931b6fc
parent 7383a6f693df9e9b024a49374d8a0c1bb1242890

Merge "Modify incorrect import path"

tempest/api/compute/servers/test_device_tagging.py

diff --git a/tempest/api/compute/servers/test_device_tagging.py b/tempest/api/compute/servers/test_device_tagging.py
index 9acc2b1..7252e1b 100644
--- a/tempest/api/compute/servers/test_device_tagging.py
+++ b/tempest/api/compute/servers/test_device_tagging.py
@@ -21,7 +21,7 @@
 from tempest.common.utils.linux import remote_client
 from tempest.common import waiters
 from tempest import config
-from tempest import exceptions
+from tempest.lib import exceptions
 from tempest import test
 
 

tempest/scenario/test_minimum_basic.py

diff --git a/tempest/scenario/test_minimum_basic.py b/tempest/scenario/test_minimum_basic.py
index 3ac6759..f2f17d2 100644
--- a/tempest/scenario/test_minimum_basic.py
+++ b/tempest/scenario/test_minimum_basic.py
@@ -16,8 +16,8 @@
 from tempest.common import custom_matchers
 from tempest.common import waiters
 from tempest import config
-from tempest import exceptions
 from tempest.lib.common.utils import test_utils
+from tempest.lib import exceptions
 from tempest.scenario import manager
 from tempest import test
 

tempest/scenario/test_server_basic_ops.py

diff --git a/tempest/scenario/test_server_basic_ops.py b/tempest/scenario/test_server_basic_ops.py
index 3aab2b8..2d2f7df 100644
--- a/tempest/scenario/test_server_basic_ops.py
+++ b/tempest/scenario/test_server_basic_ops.py
@@ -18,8 +18,8 @@
 
 from tempest.common import waiters
 from tempest import config
-from tempest import exceptions
 from tempest.lib.common.utils import test_utils
+from tempest.lib import exceptions
 from tempest.scenario import manager
 from tempest import test