aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/sql/ip-split-pools-db-restart/pretest.dat
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2015-12-28 04:15:27 +0100
committerAndreas Steffen <andreas.steffen@strongswan.org>2016-01-03 06:28:48 +0100
commit9db530493fd449795dfd48b2ae07a909ce50e377 (patch)
treeb363230e7fef701104ade51f1c70c279bf89e256 /testing/tests/sql/ip-split-pools-db-restart/pretest.dat
parent1a79525559cc93b363606464419e28268265a904 (diff)
downloadstrongswan-9db530493fd449795dfd48b2ae07a909ce50e377.tar.bz2
strongswan-9db530493fd449795dfd48b2ae07a909ce50e377.tar.xz
testing: Change sql scenarios to swanctl
Diffstat (limited to 'testing/tests/sql/ip-split-pools-db-restart/pretest.dat')
-rw-r--r--testing/tests/sql/ip-split-pools-db-restart/pretest.dat14
1 files changed, 6 insertions, 8 deletions
diff --git a/testing/tests/sql/ip-split-pools-db-restart/pretest.dat b/testing/tests/sql/ip-split-pools-db-restart/pretest.dat
index 706cb3205..d0c7b9c76 100644
--- a/testing/tests/sql/ip-split-pools-db-restart/pretest.dat
+++ b/testing/tests/sql/ip-split-pools-db-restart/pretest.dat
@@ -1,6 +1,3 @@
-moon::rm /etc/ipsec.d/cacerts/*
-carol::rm /etc/ipsec.d/cacerts/*
-dave::rm /etc/ipsec.d/cacerts/*
moon::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/db.d/ipsec.sql
carol::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/db.d/ipsec.sql
dave::cat /usr/local/share/strongswan/templates/database/sql/sqlite.sql /etc/ipsec.d/data.sql > /etc/db.d/ipsec.sql
@@ -9,10 +6,11 @@ carol::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
dave::cat /etc/db.d/ipsec.sql | sqlite3 /etc/db.d/ipsec.db
moon::ipsec pool --status 2> /dev/null
moon::ipsec pool --leases 2> /dev/null
-moon::ipsec start
-dave::ipsec start
-carol::ipsec start
+moon::service charon start 2> /dev/null
+carol::service charon start 2> /dev/null
+dave::service charon start 2> /dev/null
+moon::expect-connection rw
dave::expect-connection home
-dave::ipsec up home
+dave::swanctl --initiate --child home 2> /dev/null
carol::expect-connection home
-carol::ipsec up home
+carol::swanctl --initiate --child home 2> /dev/null