From 0349c6f2e055e87609cedd39db73ae1b824aaca2 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 27 Jan 2016 20:12:02 -0800 Subject: [PATCH] Update integration tests --- ..._application_edge_test.sh => 330_process_edge_test.sh} | 8 ++++---- ...t_2_test.sh => 340_process_edge_across_host_2_test.sh} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename integration/{330_application_edge_test.sh => 330_process_edge_test.sh} (64%) rename integration/{340_application_edge_across_host_2_test.sh => 340_process_edge_across_host_2_test.sh} (81%) diff --git a/integration/330_application_edge_test.sh b/integration/330_process_edge_test.sh similarity index 64% rename from integration/330_application_edge_test.sh rename to integration/330_process_edge_test.sh index 712813f29..6927a1964 100755 --- a/integration/330_application_edge_test.sh +++ b/integration/330_process_edge_test.sh @@ -12,10 +12,10 @@ weave_on $HOST1 run -dti --name client alpine /bin/sh -c "while true; do \ sleep 1; \ done" -wait_for applications $HOST1 60 "nginx: worker process" nc +wait_for processes $HOST1 60 "nginx: worker process" nc -has applications $HOST1 "nginx: worker process" -has applications $HOST1 nc -has_connection applications $HOST1 nc "nginx: worker process" +has processes $HOST1 "nginx: worker process" +has processes $HOST1 nc +has_connection processes $HOST1 nc "nginx: worker process" scope_end_suite diff --git a/integration/340_application_edge_across_host_2_test.sh b/integration/340_process_edge_across_host_2_test.sh similarity index 81% rename from integration/340_application_edge_across_host_2_test.sh rename to integration/340_process_edge_across_host_2_test.sh index 35748b0b9..60d362236 100755 --- a/integration/340_application_edge_across_host_2_test.sh +++ b/integration/340_process_edge_across_host_2_test.sh @@ -19,9 +19,9 @@ done" sleep 30 # need to allow the scopes to poll dns, resolve the other app ids, and send them reports check() { - has applications $1 "nginx: worker process" - has applications $1 nc - has_connection applications $1 nc "nginx: worker process" + has processes $1 "nginx: worker process" + has processes $1 nc + has_connection processes $1 nc "nginx: worker process" } check $HOST1