summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorfumihiko kakuma <kakuma@valinux.co.jp>2016-11-28 13:21:26 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2016-12-10 21:31:34 +0900
commit46409763d4dae1f0bdd2a6e17033b37eef4b3ebd (patch)
tree092f12daa29fe81092245a2afc7561a6879b30e7
parentb5d232d560ee5b5c52436cd986056217ac139915 (diff)
Get some debug information
Get log for command execution error and ryu bgp app. Signed-off-by: Fumihiko Kakuma <kakuma@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/integrated/common/docker_base.py3
-rw-r--r--ryu/tests/integrated/common/ryubgp.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/ryu/tests/integrated/common/docker_base.py b/ryu/tests/integrated/common/docker_base.py
index 1cb7cbb6..2986cc90 100644
--- a/ryu/tests/integrated/common/docker_base.py
+++ b/ryu/tests/integrated/common/docker_base.py
@@ -132,7 +132,8 @@ class Command(object):
LOG.info(out.command)
if out.returncode == 0:
return out
- LOG.error(out.stderr)
+ LOG.error("stdout: %s" % out)
+ LOG.error("stderr: %s" % out.stderr)
if i + 1 >= try_times:
break
time.sleep(interval)
diff --git a/ryu/tests/integrated/common/ryubgp.py b/ryu/tests/integrated/common/ryubgp.py
index 35c9afe2..820278b7 100644
--- a/ryu/tests/integrated/common/ryubgp.py
+++ b/ryu/tests/integrated/common/ryubgp.py
@@ -172,6 +172,7 @@ class RyuBGPContainer(base.BGPContainer):
else:
try_times = 1
cmd = "ryu-manager --verbose "
+ cmd += "--config-file %s " % self.SHARED_RYU_CONF
cmd += "--bgp-app-config-file %s " % self.SHARED_BGP_CONF
cmd += "ryu.services.protocols.bgp.application"
for i in range(try_times):