GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 00:37:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests: consistently disable isolate-workers in tests

Browse Source 
That is to prevent coverage reporting in tests.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos
2019-01-20 06:09:47 +01:00
parent a1d5ec1e1c
commit 27c83dcf42
45 changed files with 92 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -67,7 +67,7 @@ Build/Fedora:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- git submodule update --init && autoreconf -fvi &&
./configure --disable-maintainer-mode --without-docker-tests --with-werror --enable-code-coverage && make -j$(nproc) && make check -j$(nproc)
./configure --disable-maintainer-mode --without-docker-tests --with-werror --enable-code-coverage && make -j$(nproc) && make check -j$(nproc) COVERAGE=1
&& make files-update && make dist && make local-code-coverage-output
tags:
- shared
@@ -190,7 +190,7 @@ pages:
stage: deploy
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
mkdir -p public/coverage && make V=1 CODE_COVERAGE_OUTPUT_DIRECTORY=public/coverage CODE_COVERAGE_BRANCH_COVERAGE=1 code-coverage-capture &&
- mkdir -p public/coverage && make V=1 CODE_COVERAGE_OUTPUT_DIRECTORY=public/coverage CODE_COVERAGE_BRANCH_COVERAGE=1 code-coverage-capture &&
make CODE_COVERAGE_OUTPUT_DIRECTORY=public/coverage local-code-coverage-output
tags:
- shared

10
tests/common.sh
View File

@@ -49,10 +49,20 @@ update_config() {
file=$1
username=$(whoami)
group=$(groups|cut -f 1 -d ' ')
if test -z "${ISOLATE_WORKERS}";then
if test "${COVERAGE}" = "1";then
ISOLATE_WORKERS=false
else
ISOLATE_WORKERS=true
fi
fi
cp "${srcdir}/data/${file}" "$file.$$.tmp"
sed -i -e 's|@USERNAME@|'${username}'|g' "$file.$$.tmp" \
-e 's|@GROUP@|'${group}'|g' "$file.$$.tmp" \
-e 's|@SRCDIR@|'${srcdir}'|g' "$file.$$.tmp" \
-e 's|@ISOLATE_WORKERS@|'${ISOLATE_WORKERS}'|g' "$file.$$.tmp" \
-e 's|@OTP_FILE@|'${OTP_FILE}'|g' "$file.$$.tmp" \
-e 's|@CRLNAME@|'${CRLNAME}'|g' "$file.$$.tmp" \
-e 's|@PORT@|'${PORT}'|g' "$file.$$.tmp" \

2
tests/data/multiple-routes.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
#auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-ban.config
View File

@@ -5,6 +5,8 @@
auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-cert-opt-pass.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
enable-auth = "plain[passwd=@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-ciphers.config
View File

@@ -5,7 +5,7 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = false
isolate-workers = @ISOLATE_WORKERS@
max-ban-score = 0

2
tests/data/test-compression-lz4.config
View File

@@ -5,7 +5,7 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = false
isolate-workers = @ISOLATE_WORKERS@
max-ban-score = 0

2
tests/data/test-compression-lzs.config
View File

@@ -5,7 +5,7 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = false
isolate-workers = @ISOLATE_WORKERS@
max-ban-score = 0

2
tests/data/test-cookie-invalidation.config
View File

@@ -5,6 +5,8 @@
auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-cookie-timeout-2.config
View File

@@ -5,6 +5,8 @@
auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-cookie-timeout.config
View File

@@ -5,6 +5,8 @@
auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-ed25519.config
View File

@@ -5,6 +5,8 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
max-ban-score = 0
# A banner to be displayed on clients

2
tests/data/test-enc-key.config
View File

@@ -5,6 +5,8 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-enc-key2.config
View File

@@ -5,6 +5,8 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-explicit-ip.config
View File

@@ -5,6 +5,8 @@
auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-group-cert.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
#auth = "plain[./data/test-group.passwd]"
#auth = "pam"
isolate-workers = false
select-group = group1
select-group = group2

2
tests/data/test-group-pass.config
View File

@@ -5,6 +5,8 @@
auth = "plain[@SRCDIR@/data/test-group.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-gssapi-local-map.config
View File

@@ -5,6 +5,8 @@
#auth = "plain[./data/test1.passwd]"
auth = "gssapi"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-gssapi-opt-cert.config
View File

@@ -6,6 +6,8 @@
auth = "gssapi[require-local-user-map=false]"
enable-auth = certificate
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-gssapi-opt-pass.config
View File

@@ -6,6 +6,8 @@
auth = "gssapi[require-local-user-map=false]"
enable-auth = "plain[passwd=@SRCDIR@/data/test1.passwd]"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-gssapi.config
View File

@@ -5,6 +5,8 @@
#auth = "plain[./data/test1.passwd]"
auth = "gssapi[require-local-user-map=false]"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-haproxy-auth.config
View File

@@ -5,6 +5,8 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
max-ban-score = 0
# A banner to be displayed on clients

2
tests/data/test-haproxy-connect.config
View File

@@ -5,7 +5,7 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = false
isolate-workers = @ISOLATE_WORKERS@
max-ban-score = 0

2
tests/data/test-iroute.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
#auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-multi-cookie.config
View File

@@ -5,6 +5,8 @@
auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-otp-cert.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
auth = "plain[passwd=@SRCDIR@/data/test-otp.passwd,otp=@OTP_FILE@]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-otp.config
View File

@@ -5,6 +5,8 @@
auth = "plain[passwd=@SRCDIR@/data/test-otp.passwd,otp=@OTP_FILE@]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-pam-noauth.config
View File

@@ -5,6 +5,8 @@
auth = "plain[@SRCDIR@/data/test-pam.passwd]"
acct = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-pam.config
View File

@@ -4,6 +4,8 @@
#auth = "certificate"
auth = "pam[gid-min=1000]"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-pass-opt-cert.config
View File

@@ -5,6 +5,8 @@ auth = "plain[passwd=@SRCDIR@/data/test1.passwd]"
enable-auth = "certificate"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-pass-script.config
View File

@@ -5,6 +5,8 @@
auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-rsa-pss.config
View File

@@ -5,6 +5,8 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
max-ban-score = 0
# A banner to be displayed on clients

2
tests/data/test-san-cert.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
#auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-sighup-key-change.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
#auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-sighup.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
#auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-stress.config
View File

@@ -5,6 +5,8 @@
auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-traffic.config
View File

@@ -5,7 +5,7 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = false
isolate-workers = @ISOLATE_WORKERS@
max-ban-score = 0

2
tests/data/test-user-cert.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-user-config.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
#auth = "plain[./data/test1.passwd]"
#auth = "pam"
isolate-workers = false
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test-user-group-cert-no-pass.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
#auth = "plain[@SRCDIR@/data/test-group.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
select-group = group1
select-group = group2

2
tests/data/test-user-group-cert.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
auth = "plain[@SRCDIR@/data/test-group.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
select-group = group1
select-group = group2

2
tests/data/test-vhost-pass-cert.config
View File

@@ -5,6 +5,8 @@
auth = "plain[passwd=@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

2
tests/data/test1.config
View File

@@ -5,6 +5,8 @@
auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
max-ban-score = 0
# A banner to be displayed on clients

2
tests/data/test3.config
View File

@@ -5,6 +5,8 @@ auth = "certificate"
#auth = "plain[@SRCDIR@/data/test1.passwd]"
#auth = "pam"
isolate-workers = @ISOLATE_WORKERS@
# A banner to be displayed on clients
#banner = "Welcome"

1
tests/test-pass-cert
View File

@@ -22,6 +22,7 @@ SERV="${SERV:-../src/ocserv}"
srcdir=${srcdir:-.}
NO_NEED_ROOT=1
PORT=4445
ISOLATE_WORKERS=false
. `dirname $0`/common.sh