nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-30 03:24:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Drop the memcache only test, make the ldap+memcache test stage more comprehensive

Browse Source 
The old memcache suite was gutted as it wasn't really much use and needed
LDAP to actually test auth caching correctly.
This commit is contained in:
Andrew Ruthven 2024-05-25 18:44:44 +12:00
parent 07c32697dd
commit 4d06333f7e
8 changed files with 5 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -3,6 +3,7 @@ stages:
- test
- testall
- testldap
- testldapmemcache
build:
stage: build
@ -136,7 +137,7 @@ test_memcache:
always
script:
- testing/gitlab_ci_script.sh memcache
- cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling webui ischedule memcache" ./run_regressions.sh all x'
- cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling webui ischedule" ./run_regressions.sh all x'
after_script:
- testing/gitlab_ci_after_script.sh
@ -158,9 +159,9 @@ test_ldap:
after_script:
- testing/gitlab_ci_after_script.sh
# Only test if the memcache test passes
# Only test if the memcache and LDAP tests pass
test_memcache_and_ldap:
stage: testldap
stage: testldapmemcache
image: debian:unstable
artifacts:
paths:
@ -174,6 +175,6 @@ test_memcache_and_ldap:
always
script:
- testing/gitlab_ci_script.sh ldap_memcache_auth
- cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="ldap_memcache" ./run_regressions.sh all x'
- cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="ldap ldap_memcache" ./run_regressions.sh all x'
after_script:
- testing/gitlab_ci_after_script.sh

1
testing/tests/memcache/0001-CachedCredentials.result
View File

@ -1 +0,0 @@
Cached credentials worked

5
testing/tests/memcache/0001-CachedCredentials.test
View File

@ -1,5 +0,0 @@
# Just check to see if the log line for cached credentials being valid is
# present. That is only issued if we're successfully fetch valid credentials
# from our cache.
SCRIPT=if grep -q "HTTPAuthLogin:CheckCache: Cached credentials for user1 are good and valid" /var/log/apache2/regression-error.log; then echo "Cached credentials worked"; else echo "Cached credentials failed"; fi

14
testing/tests/memcache/Create-Database.result
View File

@ -1,14 +0,0 @@
Supported locales updated.
Updated view: dav_principal.sql applied.
CalDAV functions updated.
RRULE functions updated.
Database permissions updated.
NOTE
====
* The password for the 'admin' user has been set to 'nimda'
Thanks for trying DAViCal! Check the configuration in /etc/davical/config.php.
For help, look at our website and wiki, or visit #davical on irc.oftc.net.

0
testing/tests/memcache/Dump-Database.result
View File

7
testing/tests/memcache/Really-Upgrade-Database.result
View File

@ -1,7 +0,0 @@
The database is version XX currently at revision 1.3.5.
No patches were applied.
Supported locales updated.
Updated view: dav_principal.sql applied.
CalDAV functions updated.
RRULE functions updated.
Database permissions updated.

140
testing/tests/memcache/Restore-Database.result
View File

@ -1,140 +0,0 @@
set_config
------------
public
(1 row)
setval
--------
1000
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
10
(1 row)
setval
--------
10
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1
(1 row)
setval
--------
1000
(1 row)

5
testing/tests/memcache/Upgrade-Database.result
View File

@ -1,5 +0,0 @@
Supported locales updated.
Updated view: dav_principal.sql applied.
CalDAV functions updated.
RRULE functions updated.
Database permissions updated.