commit d938876e88491b6065831ae69d34e9740dee2140
author Masayuki Igawa <igawa@mxs.nes.nec.co.jp> Tue Jan 20 14:56:42 2015 +0900
committer Masayuki Igawa <igawa@mxs.nes.nec.co.jp> Thu Feb 12 09:18:32 2015 +0900
tree 70c0b6863658df543fdcc1f1f2d415d0cbdb4096
parent 90c914eb3a8f02d84931bd2afad09de669592235

Change tempest Conflict exc to tempest-lib exc

This commit changes tempest.exceptions.Conflict to
tempest_lib.exceptions.Conflict. This is one of the migrating
rest client to tempest-lib works.

Change-Id: I860a961c442f35ef4a75013e19bfe92f61a587b8

tempest/api/compute/admin/test_servers_negative.py

diff --git a/tempest/api/compute/admin/test_servers_negative.py b/tempest/api/compute/admin/test_servers_negative.py
index 9800bb4..81dabb1 100644
--- a/tempest/api/compute/admin/test_servers_negative.py
+++ b/tempest/api/compute/admin/test_servers_negative.py
@@ -144,6 +144,6 @@
         self.assertEqual(202, resp.status)
         self.client.wait_for_server_status(server_id, 'SUSPENDED')
         # migrate an suspended server should fail
-        self.assertRaises(exceptions.Conflict,
+        self.assertRaises(lib_exc.Conflict,
                           self.client.migrate_server,
                           server_id)