Matching test_check_vm_ip_dhcp on ip only 55/34055/2
authorDan Radez <dradez@redhat.com>
Tue, 2 May 2017 14:06:23 +0000 (10:06 -0400)
committerDan Radez <dradez@redhat.com>
Tue, 2 May 2017 15:15:58 +0000 (11:15 -0400)
No nee dto look for the string surrounding the ip that's being looked
for in this test. simplifying the code to only look for the ip

Change-Id: I80e6336c58573e5970eafe2608daf7c61e43b717
Signed-off-by: Dan Radez <dradez@redhat.com>
snaps/openstack/tests/create_instance_tests.py

index 9fe5fef..d8d69b3 100644 (file)
@@ -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: