diff options
| author | Takashi Natsume <takanattie@gmail.com> | 2020-05-09 09:34:25 +0000 |
|---|---|---|
| committer | Takashi Natsume <takanattie@gmail.com> | 2020-08-15 07:45:23 +0000 |
| commit | 28ed0c5c9a7572c002e520685bed60ccc706175b (patch) | |
| tree | 22700512c8727ccb213225d0eb9505f23342a447 /nova/tests/functional/test_servers.py | |
| parent | 1c2cccab71def3ccf46e21fe14c0022686481d1a (diff) | |
| download | nova-28ed0c5c9a7572c002e520685bed60ccc706175b.tar.gz | |
Remove six.PY2 and six.PY3
Remove six.PY2 and six.PY3.
Subsequent patches will replace other six usages.
Change-Id: Iccce0ab50eee515e533ab36c8e7adc10cb3f7019
Implements: blueprint six-removal
Signed-off-by: Takashi Natsume <takanattie@gmail.com>
Diffstat (limited to 'nova/tests/functional/test_servers.py')
| -rw-r--r-- | nova/tests/functional/test_servers.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nova/tests/functional/test_servers.py b/nova/tests/functional/test_servers.py index d85e148ee7..bcc02571c0 100644 --- a/nova/tests/functional/test_servers.py +++ b/nova/tests/functional/test_servers.py @@ -4704,14 +4704,8 @@ class ConsumerGenerationConflictTest( self._wait_for_server_parameter(server, {'OS-EXT-STS:task_state': None}) - # The instance action should have failed with details. - # save_and_reraise_exception gets different results between py2 and py3 - # for the traceback but we want to use the more specific - # "claim_resources" for py3. We can remove this when we drop support - # for py2. - error_in_tb = 'claim_resources' if six.PY3 else 'select_destinations' self._assert_resize_migrate_action_fail( - server, instance_actions.MIGRATE, error_in_tb) + server, instance_actions.MIGRATE, 'claim_resources') # The migration is aborted so the instance is ACTIVE on the source # host instead of being in VERIFY_RESIZE state. |