Don't allocate tty, makes docker exec hang

Also:
- Add PGCONNECT_TIMEOUT to psql.sh
- Fix expected psql output in the test scripts

ci/docker/psql.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-I="-i "
+I="-it "
 if [[ "$*" == *"-c"* ]]; then
     I=""
 fi
-docker exec $I -t docker_postgres_1 psql -U nivlheim -h localhost -d nivlheim "$@"
+docker exec $I -e PGCONNECT_TIMEOUT=30 docker_postgres_1 psql -U nivlheim -h localhost -d nivlheim "$@"

tests/test_cert_handling.sh

@@ -138,7 +138,7 @@ docker run --rm --network host -v clientvar:/var nivlheimclient --debug > $tempd
 
 # Verify the certificate chain
 chain=$($PSQL --no-align -t -c "SELECT certid,first,previous FROM certificates ORDER BY certid")
-expect=$(echo -e "1|1|\r\n2|1|1\r\n3|1|2\r\n")
+expect=$(echo -e "1|1|\n2|1|1\n3|1|2\n")
 if [[ "$chain" != "$expect" ]]; then
 	echo "Certificate chain differs from expected value:"
 	echo "$chain"

tests/test_clones.sh

@@ -9,6 +9,7 @@
 echo "------------ Testing cloned machines ------------"
 set -e
 cd `dirname $0`
+PSQL=../ci/docker/psql.sh
 
 function printlogs() {
 	echo "------- access_log -------------------------------"
@@ -34,6 +35,9 @@ function finish {
 }
 trap finish EXIT
 
+# The following line is not necessary when running on a GitHub runner, but when running locally you might keep a server between runs
+$PSQL -c "delete from files; delete from hostinfo; delete from certificates; ALTER SEQUENCE certificates_certid_seq RESTART WITH 1;"
+
 # Whitelist the private network address ranges
 curl -sS -X POST 'http://localhost:4040/api/v2/settings/ipranges' -d 'ipRange=192.168.0.0/16'
 curl -sS -X POST 'http://localhost:4040/api/v2/settings/ipranges' -d 'ipRange=172.16.0.0/12'
@@ -93,9 +97,8 @@ if docker exec docker_nivlheimweb_1 grep "cgi:error" /var/log/httpd/error_log |
 fi
 
 # Check that the database table contains 1 cert which is revoked
-PSQL=../ci/docker/psql.sh
 chain=$($PSQL -X --no-align -t -c "SELECT certid,revoked,first FROM certificates ORDER BY certid")
-expect=$(echo -e "1|t|1\r\n")
+expect=$(echo -e "1|t|1\n")
 if [[ "$chain" != "$expect" ]]; then
 	echo "The certificate list differ from expectation:"
 	$PSQL -e -X -c "SELECT certid,revoked,first FROM certificates ORDER BY certid"