diff options
| author |   Steven Pisarski <s.pisarski@cablelabs.com> | 2017-05-02 15:58:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-02 15:58:03 +0000 |
| commit | b30033c2de7cf29ed72c098234b31a2008f114b6 (patch) | |
| tree | e2715d4c3043fff638847303954657db806afb69 | |
| parent | 56817298a585791f9c49a162434831062142d41d (diff) | |
| parent | d3895af388091b03c9df070e5bebe524d08de8cd (diff) | |
Merge "Matching test_check_vm_ip_dhcp on ip only"
| -rw-r--r-- | snaps/openstack/tests/create_instance_tests.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index 9fe5fef..d8d69b3 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -354,20 +354,15 @@ class SimpleHealthCheck(OSIntegrationTestCase): found = False timeout = 160 start_time = time.time() - match_value = 'Lease of.*obtained' - logger.info("Looking for expression %s in the console log" % match_value) + logger.info("Looking for IP %s in the console log" % ip) full_log = '' while timeout > time.time() - start_time: output = vm.get_console_output() full_log = full_log + output - if re.search(match_value, output): + if re.search(ip, output): logger.info('DHCP lease obtained logged in console') - if ip in output: - logger.info('With correct IP address') - found = True - else: - logger.error('With incorrect IP address') + found = True break if not found: |