Skip to content

Commit 573bb6b

Browse files
committed
Use CommandFailed exception from tempest_lib
Remove exceptions.py from functional/common. Import exception with the same code from the tempest_lib to tests. Change-Id: Ifaa658209c18dd608836079f57ed18fcf10fb84e
1 parent 7b7620a commit 573bb6b

5 files changed

Lines changed: 4 additions & 30 deletions

File tree

functional/common/exceptions.py

Lines changed: 0 additions & 26 deletions
This file was deleted.

functional/common/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import six
2020

21-
from functional.common import exceptions
21+
from tempest_lib import exceptions
2222

2323
COMMON_DIR = os.path.dirname(os.path.abspath(__file__))
2424
FUNCTIONAL_DIR = os.path.normpath(os.path.join(COMMON_DIR, '..'))

functional/tests/compute/v2/test_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
import testtools
1717

18-
from functional.common import exceptions
1918
from functional.common import test
19+
from tempest_lib import exceptions
2020

2121

2222
class ServerTests(test.TestCase):

functional/tests/identity/v2/test_user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# under the License.
1212

1313
from tempest_lib.common.utils import data_utils
14+
from tempest_lib import exceptions
1415

15-
from functional.common import exceptions
1616
from functional.tests.identity.v2 import test_identity
1717

1818

functional/tests/identity/v3/test_domain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# under the License.
1212

1313
from tempest_lib.common.utils import data_utils
14+
from tempest_lib import exceptions
1415

15-
from functional.common import exceptions
1616
from functional.tests.identity.v3 import test_identity
1717

1818

0 commit comments

Comments
 (0)