aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Dahlberg <rasmus@mullvad.net>2022-09-06 16:15:02 +0200
committerRasmus Dahlberg <rasmus@mullvad.net>2022-09-06 16:15:02 +0200
commita365db4b9c35969298aa6469d8e8dc9fafb6fa65 (patch)
tree1b8bb6118434147d2e89b7e054f5c954b2bb6412
parent5a4b70db07f0996d53399033c0734915f30548fc (diff)
xxx
-rw-r--r--integration/conf/client.config2
-rwxr-xr-xintegration/test.sh7
2 files changed, 7 insertions, 2 deletions
diff --git a/integration/conf/client.config b/integration/conf/client.config
index 8472d81..d6037b3 100644
--- a/integration/conf/client.config
+++ b/integration/conf/client.config
@@ -11,3 +11,5 @@
cli_priv=
cli_domain_hint=
+cli_priv=29599fd81e266e161a9df977044dda89ab72fe9c8a98f23026f7fb63ee2feed9
+cli_domain_hint=_sigsum_v0.testonly.rgdd.se
diff --git a/integration/test.sh b/integration/test.sh
index 1738797..85223a2 100755
--- a/integration/test.sh
+++ b/integration/test.sh
@@ -330,11 +330,14 @@ function node_stop_fe() {
function node_stop_be() {
for i in $@; do
# The Trillian log server doesn't exit properly on SIGINT so we give it 5 second and then send SIGTERM.
- pp ${nvars[$i:tsrv_pid]} && /usr/bin/kill --signal SIGINT --timeout 5000 SIGTERM ${nvars[$i:tsrv_pid]}
+ pp ${nvars[$i:tsrv_pid]} && kill -2 ${nvars[$i:tsrv_pid]}
while :; do
sleep 1
- pp ${nvars[$i:tsrv_pid]} && continue
+ if pp ${nvars[$i:tsrv_pid]}; then
+ kill -2 ${nvars[$i:tsrv_pid]}
+ continue
+ fi
break
done