summaryrefslogtreecommitdiffhomepage
path: root/test/scenario_test/docker_control.py
diff options
context:
space:
mode:
authorHiroshi Yokoi <yokoi.hiroshi@po.ntts.co.jp>2015-01-15 15:59:16 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-01-15 19:52:05 +0900
commitd2d88bfb929d40e788def9ce85749dbc85d0f02f (patch)
tree6c8f054aec4685c95ed7137a628a7e6ca6be9a4c /test/scenario_test/docker_control.py
parent8bcc2c0d768abe7232bf9d47e5c2ef733d0f9d65 (diff)
scenario_test: made small changes
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'test/scenario_test/docker_control.py')
-rw-r--r--test/scenario_test/docker_control.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/test/scenario_test/docker_control.py b/test/scenario_test/docker_control.py
index e081df26..f1881b6b 100644
--- a/test/scenario_test/docker_control.py
+++ b/test/scenario_test/docker_control.py
@@ -14,6 +14,8 @@ BRIDGE_0 = "br0"
BRIDGE_1 = "br1"
BRIDGE_2 = "br2"
+sleep_time = 40
+
def test_user_check():
root = False
outbuf = local("echo $USER", capture=True)
@@ -160,17 +162,15 @@ def docker_container_append(quagga_num):
cmd = "docker exec gobgp /usr/bin/pkill gobgp -SIGHUP"
local(cmd, capture=True)
print "please wait"
- sleep_time = 15
time.sleep(sleep_time)
print "complete append docker container."
-def docker_container_depend(quagga_num):
+def docker_container_removed(quagga_num):
print "start remove docker container."
quagga = "q" + str(quagga_num)
docker_stop_quagga(quagga)
print "please wait"
- sleep_time = 15
time.sleep(sleep_time)
print "complete remove docker container."
@@ -222,7 +222,6 @@ def init_test_env_executor(quagga_num):
gobgp_start()
print "please wait"
- sleep_time = 15
time.sleep(sleep_time)
print "complete initialization of test environment."
@@ -233,4 +232,4 @@ def docker_related_install_executor():
print "you are not root"
print "please run the test after you login as root"
return
- docker_related_installation() \ No newline at end of file
+ docker_related_installation()