Add DBI in e2e-tests
This commit is contained in:
parent
11977f19c1
commit
38365b94ee
10
Makefile
10
Makefile
|
@ -401,13 +401,21 @@ e2e-tests/conf/apache2.pid: start_web_server
|
||||||
|
|
||||||
start_web_server: all prepare_test_server
|
start_web_server: all prepare_test_server
|
||||||
# Clean old server if launched
|
# Clean old server if launched
|
||||||
@if test "$(TESTBACKEND)" = "DBI"; then \
|
if test "$(TESTBACKEND)" = "DBI"; then \
|
||||||
echo 'create table lmConfig (cfgNum int, data text);'|sqlite3 e2e-tests/conf/config.db; \
|
echo 'create table lmConfig (cfgNum int, data text);'|sqlite3 e2e-tests/conf/config.db; \
|
||||||
echo 'create table sessions (id text, a_session text, LastUpdated int);'|sqlite3 e2e-tests/conf/sessions.db; \
|
echo 'create table sessions (id text, a_session text, LastUpdated int);'|sqlite3 e2e-tests/conf/sessions.db; \
|
||||||
perl -Ilemonldap-ng-common/blib/lib ./lemonldap-ng-common/scripts/convertConfig \
|
perl -Ilemonldap-ng-common/blib/lib ./lemonldap-ng-common/scripts/convertConfig \
|
||||||
--current=e2e-tests/conf/lemonldap-ng.ini \
|
--current=e2e-tests/conf/lemonldap-ng.ini \
|
||||||
--new=e2e-tests/conf/lemonldap-ng-sql.ini; \
|
--new=e2e-tests/conf/lemonldap-ng-sql.ini; \
|
||||||
mv e2e-tests/conf/lemonldap-ng-sql.ini e2e-tests/conf/lemonldap-ng.ini; \
|
mv e2e-tests/conf/lemonldap-ng-sql.ini e2e-tests/conf/lemonldap-ng.ini; \
|
||||||
|
LLNG_DEFAULTCONFFILE=e2e-tests/conf/lemonldap-ng.ini \
|
||||||
|
perl -Ilemonldap-ng-common/blib/lib -Ilemonldap-ng-manager/blib/lib -Ilemonldap-ng-handler/blib/lib \
|
||||||
|
lemonldap-ng-common/scripts/lemonldap-ng-cli --yes 1 \
|
||||||
|
set globalStorage Apache::Session::SQLite3; \
|
||||||
|
LLNG_DEFAULTCONFFILE=e2e-tests/conf/lemonldap-ng.ini \
|
||||||
|
perl -Ilemonldap-ng-common/blib/lib -Ilemonldap-ng-manager/blib/lib -Ilemonldap-ng-handler/blib/lib \
|
||||||
|
lemonldap-ng-common/scripts/lemonldap-ng-cli --yes 1 \
|
||||||
|
addKey globalStorageOptions DataSource 'dbi:SQLite:dbname='`pwd`'/e2e-tests/conf/sessions.db'; \
|
||||||
fi
|
fi
|
||||||
-@[ -e e2e-tests/conf/apache2.pid ] && kill `cat e2e-tests/conf/apache2.pid` || true
|
-@[ -e e2e-tests/conf/apache2.pid ] && kill `cat e2e-tests/conf/apache2.pid` || true
|
||||||
-@[ -e e2e-tests/conf/nginx.pid ] && kill `cat e2e-tests/conf/nginx.pid` || true
|
-@[ -e e2e-tests/conf/nginx.pid ] && kill `cat e2e-tests/conf/nginx.pid` || true
|
||||||
|
|
39
e2e-tests/lemonldap-ng-sql.ini
Normal file
39
e2e-tests/lemonldap-ng-sql.ini
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
[all]
|
||||||
|
|
||||||
|
logLevel = debug
|
||||||
|
|
||||||
|
;globalStorage = Apache::Session::SQLite3
|
||||||
|
;globalStorageOptions = { DataSource => 'dbi:SQLite:dbname=__pwd__/e2e-tests/conf/sessions.db' }
|
||||||
|
|
||||||
|
[configuration]
|
||||||
|
|
||||||
|
type=CDBI
|
||||||
|
dbiChain = dbi:SQLite:dbname=__pwd__/e2e-tests/conf/config.db
|
||||||
|
|
||||||
|
[portal]
|
||||||
|
|
||||||
|
notification = 0
|
||||||
|
checkXSS = 0
|
||||||
|
portalSkin = bootstrap
|
||||||
|
staticPrefix = /static
|
||||||
|
languages = fr, en
|
||||||
|
templateDir = __pwd__/lemonldap-ng-portal/site/templates
|
||||||
|
;u2fActivation = 1
|
||||||
|
;u2fSelfRegistration = 1
|
||||||
|
|
||||||
|
[handler]
|
||||||
|
|
||||||
|
https = 0
|
||||||
|
status = 1
|
||||||
|
useRedirectOnError = 0
|
||||||
|
|
||||||
|
[manager]
|
||||||
|
|
||||||
|
protection = manager
|
||||||
|
staticPrefix = /static
|
||||||
|
languages = fr, en
|
||||||
|
templateDir = __pwd__/lemonldap-ng-manager/site/templates
|
||||||
|
|
||||||
|
[node-handler]
|
||||||
|
|
||||||
|
nodeVhosts = test2.example.com
|
|
@ -39,5 +39,6 @@ staticPrefix = /static
|
||||||
languages = fr, en
|
languages = fr, en
|
||||||
templateDir = __pwd__/lemonldap-ng-manager/site/templates
|
templateDir = __pwd__/lemonldap-ng-manager/site/templates
|
||||||
|
|
||||||
[apply]
|
[node-handler]
|
||||||
|
|
||||||
|
nodeVhosts = test2.example.com
|
||||||
|
|
|
@ -36,7 +36,7 @@ sub populate {
|
||||||
$self = $self->$backend(@_);
|
$self = $self->$backend(@_);
|
||||||
}
|
}
|
||||||
if ( $backend =~
|
if ( $backend =~
|
||||||
/^Apache::Session::(?:(?:Postgre|Redi)s|(?:Oracl|Sybas)e|(?:My|No)SQL|F(?:ile|lex)|Cassandra|LDAP)/
|
/^Apache::Session::(?:(?:Postgre|Redi)s|S(?:QLite3|ybase)|(?:My|No)SQL|F(?:ile|lex)|Cassandra|Oracle|LDAP)/
|
||||||
and !$self->{args}->{useStorable} )
|
and !$self->{args}->{useStorable} )
|
||||||
{
|
{
|
||||||
$self->{serialize} =
|
$self->{serialize} =
|
||||||
|
|
|
@ -24,7 +24,7 @@ $action ||= "help";
|
||||||
|
|
||||||
if ( $action =~ /^(?:[gs]et|(?:add|del)Key)$/ ) {
|
if ( $action =~ /^(?:[gs]et|(?:add|del)Key)$/ ) {
|
||||||
eval { require Lemonldap::NG::Manager::Cli; };
|
eval { require Lemonldap::NG::Manager::Cli; };
|
||||||
die 'Manager libraries not available, aborting' if ($@);
|
die "Manager libraries not available, aborting ($@)" if ($@);
|
||||||
Lemonldap::NG::Manager::Cli->run(@ARGV);
|
Lemonldap::NG::Manager::Cli->run(@ARGV);
|
||||||
}
|
}
|
||||||
elsif ( $action =~ /^(?:info|update-cache)$/ ) {
|
elsif ( $action =~ /^(?:info|update-cache)$/ ) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user