diff --git a/libnetwork/test/integration/dnet/bridge.bats b/libnetwork/test/integration/dnet/bridge.bats index 325110fab9..eff60eee6f 100644 --- a/libnetwork/test/integration/dnet/bridge.bats +++ b/libnetwork/test/integration/dnet/bridge.bats @@ -64,6 +64,23 @@ function test_single_network_connectivity() { done } +@test "Test default network dnet ungraceful restart" { + skip_for_circleci + + echo $(docker ps) + + for iter in `seq 1 2`; + do + if [ "$iter" -eq 1 ]; then + test_single_network_connectivity bridge 3 skip + docker restart dnet-1-bridge + wait_for_dnet $(inst_id2port 1) dnet-1-bridge + else + test_single_network_connectivity bridge 3 + fi + done +} + @test "Test bridge network" { skip_for_circleci diff --git a/libnetwork/test/integration/dnet/run-integration-tests.sh b/libnetwork/test/integration/dnet/run-integration-tests.sh index 45123cacbb..9184025c25 100755 --- a/libnetwork/test/integration/dnet/run-integration-tests.sh +++ b/libnetwork/test/integration/dnet/run-integration-tests.sh @@ -99,7 +99,7 @@ function run_dnet_tests() { ./integration-tmp/bin/bats ./test/integration/dnet/dnet.bats } -function run_simple_tests() { +function run_simple_consul_tests() { # Test a single node configuration with a global scope test driver ## Setup start_dnet 1 simple 1>>${INTEGRATION_ROOT}/test.log 2>&1 @@ -205,15 +205,15 @@ if [ -z "$SUITES" ]; then then # We can only run a limited list of suites in circleci because of the # old kernel and limited docker environment. - suites="dnet simple multi_consul multi_zk multi_etcd" + suites="dnet simple_consul multi_consul multi_zk multi_etcd" else - suites="dnet simple multi_consul multi_zk multi_etcd bridge overlay_consul overlay_zk overlay_etcd" + suites="dnet simple_consul multi_consul multi_zk multi_etcd bridge overlay_consul overlay_zk overlay_etcd" fi else suites="$SUITES" fi -if [[ "$suites" =~ .*consul.* ]]; then +if [[ ( "$suites" =~ .*consul.* ) || ( "$suites" =~ .*bridge.* ) ]]; then echo "Starting consul ..." start_consul 1>>${INTEGRATION_ROOT}/test.log 2>&1 cmap[pr_consul]=pr_consul