diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-12-13 18:11:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-13 18:11:22 +0000 |
| commit | fdd7790f733d83022ace8c5be102a1aa57699fcb (patch) | |
| tree | 195641783635fda2445ac25cbf6cbdd2363e3ea1 /test/functest/results.py | |
| parent | 76d39e29232020e2fc7b4252185e301484ebca1d (diff) | |
| parent | e01762afb78c7c4938ce16d52b7f47fdbb4ed4dc (diff) | |
Merge "Don't pass ips to get_ssh_output and check_ping"
Diffstat (limited to 'test/functest/results.py')
| -rw-r--r-- | test/functest/results.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/functest/results.py b/test/functest/results.py index 343c962..37dfc24 100644 --- a/test/functest/results.py +++ b/test/functest/results.py @@ -25,11 +25,14 @@ class Results(object): self.num_tests_failed = 0 def get_ping_status(self, - vm_source, ip_source, - vm_target, ip_target, + vm_source, + vm_target, expected="PASS", timeout=30): console_log = vm_source.get_console_output() + ip_source = vm_source.networks.itervalues().next()[0] + ip_target = vm_target.networks.itervalues().next()[0] + if "request failed" in console_log: # Normally, cirros displays this message when userdata fails logger.debug("It seems userdata is not supported in " @@ -112,10 +115,11 @@ class Results(object): def add_success(self, test): self.add_to_summary(2, "PASS", test) - def check_ssh_output(self, vm_source, ip_source, - vm_target, ip_target, + def check_ssh_output(self, vm_source, vm_target, expected, timeout=30): console_log = vm_source.get_console_output() + ip_source = vm_source.networks.itervalues().next()[0] + ip_target = vm_target.networks.itervalues().next()[0] if "request failed" in console_log: # Normally, cirros displays this message when userdata fails |