From b255a395171511f4ec15c37f6477230680efb596 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Thu, 7 Jan 2016 13:55:31 +0000 Subject: [PATCH] Fix tests. --- integration/330_application_edge_test.sh | 6 +++--- integration/340_application_edge_across_host_2_test.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integration/330_application_edge_test.sh b/integration/330_application_edge_test.sh index 56363b041..978ce3168 100755 --- a/integration/330_application_edge_test.sh +++ b/integration/330_application_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 application $HOST1 60 nginx client +wait_for applications $HOST1 60 nginx client -has applications $HOST1 nginx +has applications $HOST1 "nginx: worker process" has applications $HOST1 nc -has_connection applications $HOST1 nc nginx +has_connection applications $HOST1 nc "nginx: worker process" scope_end_suite diff --git a/integration/340_application_edge_across_host_2_test.sh b/integration/340_application_edge_across_host_2_test.sh index e3b43e07b..35748b0b9 100755 --- a/integration/340_application_edge_across_host_2_test.sh +++ b/integration/340_application_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 + has applications $1 "nginx: worker process" has applications $1 nc - has_connection applications $1 nc nginx + has_connection applications $1 nc "nginx: worker process" } check $HOST1