Merge "Fix runtestmanager and update bm"
diff --git a/tcp_tests/managers/k8s/pods.py b/tcp_tests/managers/k8s/pods.py
index 98192a6..4426170 100644
--- a/tcp_tests/managers/k8s/pods.py
+++ b/tcp_tests/managers/k8s/pods.py
@@ -53,7 +53,7 @@
'"{1}"'.format(self.name, phases))
return self
- def wait_running(self, timeout=240, interval=3):
+ def wait_running(self, timeout=600, interval=3):
return self.wait_phase('Running', timeout=timeout, interval=interval)
diff --git a/tcp_tests/managers/k8smanager.py b/tcp_tests/managers/k8smanager.py
index 9b7fa80..d1a9a87 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -350,7 +350,7 @@
pod = cnf_pod.read()
status = pod.status.phase
- if status is 'Failed':
+ if status == 'Failed':
describe = "kubectl describe po {0} -n {0}".format(pod_mark)
LOG.info(self.controller_check_call(describe, timeout=30))
raise RuntimeError("Conformance failed")
@@ -390,7 +390,7 @@
:return:
"""
with self.__underlay.remote(node_name=self.controller_name) as remote:
- if system is 'docker':
+ if system == 'docker':
cmd = ("docker ps --all | grep \"{0}\" |"
" awk '{{print $1}}'".format(container))
result = remote.check_call(cmd, raise_on_err=False)