diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-26 03:20:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-26 03:20:17 +0000 |
| commit | 0fa3c84b4fff273c75de454736cd0d631ee40a08 (patch) | |
| tree | 5ad3504432ca7c9864de258c26fff49956875687 /openstackclient/tests/functional/compute/v2/test_server.py | |
| parent | 02f492ae4cc52ed2642f42bc0c1e5e417ebfe527 (diff) | |
| parent | 1008544882fbdae16b045abca05cf3e2e8a14787 (diff) | |
| download | python-openstackclient-0fa3c84b4fff273c75de454736cd0d631ee40a08.tar.gz | |
Merge "Default --nic to 'auto' if creating a server with >= 2.37"
Diffstat (limited to 'openstackclient/tests/functional/compute/v2/test_server.py')
| -rw-r--r-- | openstackclient/tests/functional/compute/v2/test_server.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/openstackclient/tests/functional/compute/v2/test_server.py b/openstackclient/tests/functional/compute/v2/test_server.py index bba16f62..3cb72d9f 100644 --- a/openstackclient/tests/functional/compute/v2/test_server.py +++ b/openstackclient/tests/functional/compute/v2/test_server.py @@ -618,7 +618,9 @@ class ServerTests(common.ComputeTestCase): server_name ) except exceptions.CommandFailed as e: - self.assertIn('nics are required after microversion 2.36', - e.stderr) - else: - self.fail('CommandFailed should be raised.') + # If we got here, it shouldn't be because a nics value wasn't + # provided to the server; it is likely due to something else in + # the functional tests like there being multiple available + # networks and the test didn't specify a specific network. + self.assertNotIn('nics are required after microversion 2.36', + e.stderr) |