fix

scionproto · Sep 5, 2019 · 0596088 · 0596088
1 parent eaba8f9
commit 0596088
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.buildkite/acceptance-pipeline.sh b/.buildkite/acceptance-pipeline.sh
@@ -16,7 +16,7 @@ fi
 
 host_acceptance="br_multi br_child br_parent br_peer br_core_multi br_core_childIf br_core_coreIf"
 
-for test in ./acceptance/discovery*_acceptance; do
+for test in ./acceptance/discovery_infra*_acceptance; do
     name="$(basename ${test%_acceptance})"
     if [[ ! "$name" =~ "$ACCEPTANCE_TEST" ]]; then
         continue

diff --git a/acceptance/discovery_infra_fetches_dynamic_acceptance/test b/acceptance/discovery_infra_fetches_dynamic_acceptance/test
@@ -25,11 +25,12 @@ test_run() {
     set -e
 
     log "Starting to serve dynamic topology with modified border router."
-    jq ".BorderRouters[].InternalAddrs.IPv4.PublicOverlay = {Addr: \"127.42.42.42\", OverlayPort: 39999} | .Timestamp = $( date +%s) | .TTL = 1" $TOPO | sponge $DYNAMIC_FULL
+    jq ".BorderRouters[].InternalAddrs.IPv4.PublicOverlay = {Addr: \"127.42.42.42\", OverlayPort: 39999} | .Timestamp = $( date +%s) | .TTL = 5" $TOPO | sponge $DYNAMIC_FULL
     cp $DYNAMIC_FULL $DYNAMIC_DEFAULT
-    sleep 2
+    sleep 1
     check_file "dynamic"
 
+    sleep 3
     check_logs "bs$IA_FILE-1"
     check_logs "cs$IA_FILE-1"
     check_logs "ps$IA_FILE-1"

diff --git a/acceptance/discovery_infra_fetches_static_acceptance/test b/acceptance/discovery_infra_fetches_static_acceptance/test
@@ -32,9 +32,10 @@ test_run() {
     log "Starting to serve static topology with modified border router."
     jq ".BorderRouters[].InternalAddrs.IPv4.PublicOverlay = {Addr: \"127.42.42.42\", OverlayPort: 39999} | .Timestamp = $( date +%s)" $TOPO | sponge $STATIC_FULL
     cp $STATIC_FULL $STATIC_DEFAULT
-    sleep 2
+    sleep 1
     check_file "static"
 
+    sleep 3
     check_logs "bs$IA_FILE-1"
     check_logs "cs$IA_FILE-1"
     check_logs "ps$IA_FILE-1"