diff options
| author | Joseph Henry <josephjah@gmail.com> | 2015-12-04 15:39:35 -0800 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2015-12-04 15:39:35 -0800 |
| commit | 7ea53dd21b320cc94077444ec18f8482f5b5cd19 (patch) | |
| tree | 88cee064615721f1e2e5a3aa83a4dca80d21fecc /netcon/docker-test/httpd/httpd_demo | |
| parent | ac8918992b647c80c6da4b7c0956fd383b15e9d7 (diff) | |
| download | infinitytier-7ea53dd21b320cc94077444ec18f8482f5b5cd19.tar.gz infinitytier-7ea53dd21b320cc94077444ec18f8482f5b5cd19.zip | |
(WIP) Additional test script changes
Diffstat (limited to 'netcon/docker-test/httpd/httpd_demo')
| -rw-r--r-- | netcon/docker-test/httpd/httpd_demo/httpd_demo.name | 0 | ||||
| -rwxr-xr-x | netcon/docker-test/httpd/httpd_demo/two_party_test.sh | 17 |
2 files changed, 17 insertions, 0 deletions
diff --git a/netcon/docker-test/httpd/httpd_demo/httpd_demo.name b/netcon/docker-test/httpd/httpd_demo/httpd_demo.name deleted file mode 100644 index e69de29b..00000000 --- a/netcon/docker-test/httpd/httpd_demo/httpd_demo.name +++ /dev/null diff --git a/netcon/docker-test/httpd/httpd_demo/two_party_test.sh b/netcon/docker-test/httpd/httpd_demo/two_party_test.sh new file mode 100755 index 00000000..164b0b2e --- /dev/null +++ b/netcon/docker-test/httpd/httpd_demo/two_party_test.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Runs test image and monitor image as daemons + +test_name=${PWD##*/} +echo 'Building dockerfiles for test: ' "$test_name" +touch "$test_name".name + +# Start netcon container to be tested +test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest) +monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest) + +echo "waiting $netcon_test_wait_time for test to complete." +sleep $netcon_test_wait_time +docker stop $(docker ps -a -q) +docker rm $test_container +docker rm $monitor_container
\ No newline at end of file |