diff options
| author | Zuul <zuul@review.openstack.org> | 2018-11-02 18:59:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-11-02 18:59:27 +0000 |
| commit | 28797fe8753201057b855baf8d453018dd7b741c (patch) | |
| tree | ba1b6a12cf2d73a1ff4bf43cdfb4cc85f59cb091 /openstackclient/tests/functional | |
| parent | 9437dffadab10856c9e161b89940393cf01f57e0 (diff) | |
| parent | 46074312583febe948c8ec8780aacd6850617cf5 (diff) | |
| download | python-openstackclient-28797fe8753201057b855baf8d453018dd7b741c.tar.gz | |
Merge "Default --nic to 'auto' if creating a server with >= 2.37" into stable/queens
Diffstat (limited to 'openstackclient/tests/functional')
| -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 0b29fe5f..13fdfa06 100644 --- a/openstackclient/tests/functional/compute/v2/test_server.py +++ b/openstackclient/tests/functional/compute/v2/test_server.py @@ -586,7 +586,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) |