aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/tnc
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2017-08-07 16:26:38 +0200
committerTobias Brunner <tobias@strongswan.org>2017-08-07 16:55:45 +0200
commitf058804df827b925172a2c8f5dd3512ccbb3b332 (patch)
tree22a098682beb0004762151c135e2ec6572e24998 /testing/tests/tnc
parent6fadc6a859d72315f72946b008f998a0d4c545e4 (diff)
downloadstrongswan-f058804df827b925172a2c8f5dd3512ccbb3b332.tar.bz2
strongswan-f058804df827b925172a2c8f5dd3512ccbb3b332.tar.xz
testing: Move collector.db in tnc/tnccs-20-ev-pt-tls scenario to /etc/db.d
Also move initialization to the pretest script (it's way faster in the in-memory database).
Diffstat (limited to 'testing/tests/tnc')
-rw-r--r--testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/carol/etc/strongswan.conf2
-rw-r--r--testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat1
-rw-r--r--testing/tests/tnc/tnccs-20-ev-pt-tls/test.conf2
3 files changed, 3 insertions, 2 deletions
diff --git a/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/carol/etc/strongswan.conf
index 8fba7413a..87c3745a3 100644
--- a/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/tnc/tnccs-20-ev-pt-tls/hosts/carol/etc/strongswan.conf
@@ -7,7 +7,7 @@ libtls {
libimcv {
plugins {
imc-swima {
- swid_database = sqlite:///etc/pts/collector.db
+ swid_database = sqlite:///etc/db.d/collector.db
}
}
}
diff --git a/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat b/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat
index d8ac3ab41..c0d732368 100644
--- a/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat
+++ b/testing/tests/tnc/tnccs-20-ev-pt-tls/pretest.dat
@@ -20,6 +20,7 @@ winnetou::ip route add 10.1.0.0/16 via 192.168.0.1
dave::ip route add 10.1.0.0/16 via 192.168.0.1
dave::cat /etc/pts/options
dave::/usr/local/bin/pt-tls-client --optionsfrom /etc/pts/options
+carol::/usr/local/bin/init_collector
carol::ip route add 10.1.0.0/16 via 192.168.0.1
carol::cat /etc/pts/options
carol::/usr/local/bin/pt-tls-client --optionsfrom /etc/pts/options
diff --git a/testing/tests/tnc/tnccs-20-ev-pt-tls/test.conf b/testing/tests/tnc/tnccs-20-ev-pt-tls/test.conf
index 08ea543e2..f434789b9 100644
--- a/testing/tests/tnc/tnccs-20-ev-pt-tls/test.conf
+++ b/testing/tests/tnc/tnccs-20-ev-pt-tls/test.conf
@@ -22,7 +22,7 @@ IPSECHOSTS="carol moon dave alice"
# Guest instances on which databases are used
#
-DBHOSTS="alice"
+DBHOSTS="alice carol"
# charon controlled by swanctl
#