From 60b959f3427258a5db8d09afa7f77cad061143db Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Thu, 21 Jan 2016 20:02:13 +0000 Subject: [PATCH] Enable local cache in e2e tests (#889) --- Makefile | 2 +- e2e-tests/lemonldap-ng.ini | 8 ++++++++ e2e-tests/lmConf-1.js | 11 +++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4f9dde7e9..5363a5ed2 100644 --- a/Makefile +++ b/Makefile @@ -266,7 +266,7 @@ extra_test: all e2e_test: all prepare_test_server start_web_server launch_protractor stop_web_server prepare_test_server: - @mkdir -p e2e-tests/conf/lock e2e-tests/conf/persistents/lock + @mkdir -p e2e-tests/conf/sessions/lock e2e-tests/conf/persistents/lock @$(MAKE) install_webserver_conf \ RCONFDIR=e2e-tests/conf \ ERASECONFIG=1 \ diff --git a/e2e-tests/lemonldap-ng.ini b/e2e-tests/lemonldap-ng.ini index eb7867864..750cdf37d 100644 --- a/e2e-tests/lemonldap-ng.ini +++ b/e2e-tests/lemonldap-ng.ini @@ -5,6 +5,14 @@ type=File dirName=__pwd__/e2e-tests/conf loglevel = debug +localStorage=Cache::FileCache +localStorageOptions={ \ + 'namespace' => 'lemonldap-ng-config',\ + 'default_expires_in' => 600, \ + 'directory_umask' => '007', \ + 'cache_root' => '__pwd__/e2e-tests/conf', \ + 'cache_depth' => 0, \ +} [portal] diff --git a/e2e-tests/lmConf-1.js b/e2e-tests/lmConf-1.js index c9ff68e90..42b646814 100644 --- a/e2e-tests/lmConf-1.js +++ b/e2e-tests/lmConf-1.js @@ -109,12 +109,19 @@ }, "globalStorage": "Apache::Session::File", "globalStorageOptions": { - "Directory": "__pwd__/e2e-tests/conf", - "LockDirectory": "__pwd__/e2e-tests/conf/lock", + "Directory": "__pwd__/e2e-tests/conf/sessions", + "LockDirectory": "__pwd__/e2e-tests/conf/sessions/lock", "generateModule": "Lemonldap::NG::Common::Apache::Session::Generate::SHA256" }, "groups": {}, "key": "qwertyui", + "localSessionStorageOptions": { + "cache_depth": 3, + "cache_root": "__pwd__/e2e-tests/conf", + "default_expires_in": 600, + "directory_umask": "007", + "namespace": "lemonldap-ng-sessions" + }, "locationRules": { "manager.example.com": { "(?#Configuration)^/(manager\\.html|conf/)": "$uid eq \"dwho\"", -- GitLab