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
This commit is contained in:
parent
7b7620ab84
commit
573bb6b941
@ -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))
|
|
@ -18,7 +18,7 @@ import testtools
|
|||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from functional.common import exceptions
|
from tempest_lib import exceptions
|
||||||
|
|
||||||
COMMON_DIR = os.path.dirname(os.path.abspath(__file__))
|
COMMON_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
FUNCTIONAL_DIR = os.path.normpath(os.path.join(COMMON_DIR, '..'))
|
FUNCTIONAL_DIR = os.path.normpath(os.path.join(COMMON_DIR, '..'))
|
||||||
|
@ -15,8 +15,8 @@ import uuid
|
|||||||
|
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
from functional.common import exceptions
|
|
||||||
from functional.common import test
|
from functional.common import test
|
||||||
|
from tempest_lib import exceptions
|
||||||
|
|
||||||
|
|
||||||
class ServerTests(test.TestCase):
|
class ServerTests(test.TestCase):
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from tempest_lib.common.utils import data_utils
|
from tempest_lib.common.utils import data_utils
|
||||||
|
from tempest_lib import exceptions
|
||||||
|
|
||||||
from functional.common import exceptions
|
|
||||||
from functional.tests.identity.v2 import test_identity
|
from functional.tests.identity.v2 import test_identity
|
||||||
|
|
||||||
|
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from tempest_lib.common.utils import data_utils
|
from tempest_lib.common.utils import data_utils
|
||||||
|
from tempest_lib import exceptions
|
||||||
|
|
||||||
from functional.common import exceptions
|
|
||||||
from functional.tests.identity.v3 import test_identity
|
from functional.tests.identity.v3 import test_identity
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user