aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2011-02-09 22:27:04 +0100
committerAndreas Steffen <andreas.steffen@strongswan.org>2011-02-09 22:27:04 +0100
commitf04d1c2dfe72479323b56244e82b9eaed5093485 (patch)
tree1cb9c3daad24f3daa78c4edaa885d4f4b8c2d97f /testing/tests
parent5ca559cfce52bc4a19c18b5a487376d53856fb4d (diff)
downloadstrongswan-f04d1c2dfe72479323b56244e82b9eaed5093485.tar.bz2
strongswan-f04d1c2dfe72479323b56244e82b9eaed5093485.tar.xz
replaced ipsec up %startall command by start_action job
Diffstat (limited to 'testing/tests')
-rw-r--r--testing/tests/sql/net2net-route-pem/pretest.dat4
-rw-r--r--testing/tests/sql/net2net-start-pem/pretest.dat5
2 files changed, 2 insertions, 7 deletions
diff --git a/testing/tests/sql/net2net-route-pem/pretest.dat b/testing/tests/sql/net2net-route-pem/pretest.dat
index 0fe12ec9b..5a537e15b 100644
--- a/testing/tests/sql/net2net-route-pem/pretest.dat
+++ b/testing/tests/sql/net2net-route-pem/pretest.dat
@@ -6,10 +6,8 @@ moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
sun::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
moon::/etc/init.d/iptables start 2> /dev/null
sun::/etc/init.d/iptables start 2> /dev/null
-moon::ipsec start
sun::ipsec start
+moon::ipsec start
moon::sleep 1
-moon::ipsec up %startall
-sun::ipsec up %startall
alice::ping -c 1 PH_IP_BOB
bob::ping -c 1 PH_IP_VENUS
diff --git a/testing/tests/sql/net2net-start-pem/pretest.dat b/testing/tests/sql/net2net-start-pem/pretest.dat
index 51fd0c664..3e168960d 100644
--- a/testing/tests/sql/net2net-start-pem/pretest.dat
+++ b/testing/tests/sql/net2net-start-pem/pretest.dat
@@ -6,9 +6,6 @@ moon::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
sun::cat /etc/ipsec.d/ipsec.sql | sqlite3 /etc/ipsec.d/ipsec.db
moon::/etc/init.d/iptables start 2> /dev/null
sun::/etc/init.d/iptables start 2> /dev/null
-moon::ipsec start
sun::ipsec start
-moon::sleep 1
-moon::ipsec up %startall
-sun::ipsec up %startall
+moon::ipsec start
moon::sleep 2