summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHiroshi Yokoi <yokoi.hiroshi@po.ntts.co.jp>2015-04-09 16:01:18 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-04-14 08:10:28 +0900
commit55b772672987566978b7c5bacf4051d8789d3f09 (patch)
tree5ca350bb8a85c3d61a00999341c93e7aa8b28431
parentbcfba3c942673c9a15342a37a8d73fe29057dc88 (diff)
scenario_test: call make_startup_file()
-rw-r--r--test/scenario_test/docker_control.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/scenario_test/docker_control.py b/test/scenario_test/docker_control.py
index 81191891..1ade6780 100644
--- a/test/scenario_test/docker_control.py
+++ b/test/scenario_test/docker_control.py
@@ -157,7 +157,7 @@ def create_config_dir():
def make_startup_file(log_opt=""):
file_buff = '#!/bin/bash' + '\n'
file_buff += "cd /go/src/github.com/osrg/gobgp/gobgpd" + '\n'
- file_buff += "./gobgpd -f " + SHARE_VOLUME + "/gobgpd.conf " + log_opt + " > " + SHARE_VOLUME + "/gobgpd.log"
+ file_buff += "./gobgpd -f " + SHARE_VOLUME + "/gobgpd.conf " + log_opt + " > " + SHARE_VOLUME + "/gobgpd.log 2>&1 "
cmd = "echo \"" + file_buff + "\" > " + CONFIG_DIR + "/" + STARTUP_FILE_NAME
local(cmd, capture=True)
@@ -508,6 +508,7 @@ def init_malformed_test_env_executor(conf_file, use_local, go_path, exabgp_path
# set log option
opt = "-l debug" if log_debug else ""
+ make_startup_file(log_opt=opt)
# execute local gobgp program in the docker container if the input option is local
if use_local:
print "execute gobgp program in local machine."