diff options
| author | Kyrylo Romanenko <kromanenko@mirantis.com> | 2016-04-13 19:09:07 +0300 |
|---|---|---|
| committer | Kyrylo Romanenko <kromanenko@mirantis.com> | 2016-04-13 19:09:07 +0300 |
| commit | 573bb6b941199d32e016257f37c649ea804484a3 (patch) | |
| tree | 8f5b075ad84232e39ed7a56bbf501f370ec689c1 /functional/common | |
| parent | 7b7620ab845e9e40e88c54910f0db4ecbe9c6033 (diff) | |
| download | python-openstackclient-573bb6b941199d32e016257f37c649ea804484a3.tar.gz | |
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
Diffstat (limited to 'functional/common')
| -rw-r--r-- | functional/common/exceptions.py | 26 | ||||
| -rw-r--r-- | functional/common/test.py | 2 |
2 files changed, 1 insertions, 27 deletions
diff --git a/functional/common/exceptions.py b/functional/common/exceptions.py deleted file mode 100644 index 47c6071e..00000000 --- a/functional/common/exceptions.py +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -class CommandFailed(Exception): - def __init__(self, returncode, cmd, output, stderr): - super(CommandFailed, self).__init__() - self.returncode = returncode - self.cmd = cmd - self.stdout = output - self.stderr = stderr - - def __str__(self): - return ("Command '%s' returned non-zero exit status %d.\n" - "stdout:\n%s\n" - "stderr:\n%s" % (self.cmd, self.returncode, - self.stdout, self.stderr)) diff --git a/functional/common/test.py b/functional/common/test.py index 810c4e43..c1bf3f36 100644 --- a/functional/common/test.py +++ b/functional/common/test.py @@ -18,7 +18,7 @@ import testtools import six -from functional.common import exceptions +from tempest_lib import exceptions COMMON_DIR = os.path.dirname(os.path.abspath(__file__)) FUNCTIONAL_DIR = os.path.normpath(os.path.join(COMMON_DIR, '..')) |
