dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use "$maintests" everywhere

Browse Source
This commit is contained in:
Xavier Guimard 2018-02-08 21:55:21 +01:00
parent 5c6e3307bd
commit 204d851792
17 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lemonldap-ng-portal/t/20-Auth-DBI-utf8.t
View File

@ -5,14 +5,14 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 8; my $maintests = 8;
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
$dbh->do('CREATE TABLE users (user text,password text,cn text)'); $dbh->do('CREATE TABLE users (user text,password text,cn text)');
@ -85,5 +85,5 @@ SKIP: {
clean_sessions(); clean_sessions();
} }
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
count($mainTests); count($maintests);
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/20-Auth-and-password-DBI-dynamic-hash.t
View File

@ -81,14 +81,14 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 6; my $maintests = 6;
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; use Digest::SHA }; eval { require DBI; require DBD::SQLite; use Digest::SHA };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
@ -202,5 +202,5 @@ SKIP: {
clean_sessions(); clean_sessions();
} }
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
count($mainTests); count($maintests);
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/20-Auth-and-password-DBI.t
View File

@ -5,14 +5,14 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 3; my $maintests = 3;
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
$dbh->do('CREATE TABLE users (user text,password text,name text)'); $dbh->do('CREATE TABLE users (user text,password text,name text)');
@ -80,5 +80,5 @@ SKIP: {
clean_sessions(); clean_sessions();
} }
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
count($mainTests); count($maintests);
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/21-Auth-LDAP-utf8.t
View File

@ -5,10 +5,10 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 8; my $maintests = 8;
SKIP: { SKIP: {
skip 'LLNGTESTLDAP is not set', $mainTests unless ( $ENV{LLNGTESTLDAP} ); skip 'LLNGTESTLDAP is not set', $maintests unless ( $ENV{LLNGTESTLDAP} );
require 't/test-ldap.pm'; require 't/test-ldap.pm';
my $client = LLNG::Manager::Test->new( my $client = LLNG::Manager::Test->new(
@ -78,6 +78,6 @@ SKIP: {
clean_sessions(); clean_sessions();
} }
count($mainTests); count($maintests);
stopLdapServer() if $ENV{LLNGTESTLDAP}; stopLdapServer() if $ENV{LLNGTESTLDAP};
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/21-Auth-and-password-LDAP.t
View File

@ -5,10 +5,10 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 3; my $maintests = 3;
SKIP: { SKIP: {
skip 'LLNGTESTLDAP is not set', $mainTests unless ( $ENV{LLNGTESTLDAP} ); skip 'LLNGTESTLDAP is not set', $maintests unless ( $ENV{LLNGTESTLDAP} );
require 't/test-ldap.pm'; require 't/test-ldap.pm';
my $client = LLNG::Manager::Test->new( my $client = LLNG::Manager::Test->new(
@ -73,6 +73,6 @@ SKIP: {
$client->logout($id); $client->logout($id);
clean_sessions(); clean_sessions();
} }
count($mainTests); count($maintests);
stopLdapServer() if $ENV{LLNGTESTLDAP}; stopLdapServer() if $ENV{LLNGTESTLDAP};
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/22-Auth-and-password-AD.t
View File

@ -5,10 +5,10 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 1; my $maintests = 1;
SKIP: { SKIP: {
skip 'No AD server given', $mainTests unless ( $ENV{ADSERVER} ); skip 'No AD server given', $maintests unless ( $ENV{ADSERVER} );
my $client = LLNG::Manager::Test->new( my $client = LLNG::Manager::Test->new(
{ {
@ -45,5 +45,5 @@ SKIP: {
clean_sessions(); clean_sessions();
} }
count($mainTests); count($maintests);
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/27-AuthProxy.t
View File

@ -3,11 +3,11 @@ use strict;
use IO::String; use IO::String;
my $res; my $res;
my $mainTests = 2; my $maintests = 2;
require 't/test-lib.pm'; require 't/test-lib.pm';
SKIP: { SKIP: {
skip 'REMOTELLNG is not set', $mainTests unless ( $ENV{REMOTELLNG} ); skip 'REMOTELLNG is not set', $maintests unless ( $ENV{REMOTELLNG} );
my $client = LLNG::Manager::Test->new( my $client = LLNG::Manager::Test->new(
{ {
ini => { ini => {
@ -33,5 +33,5 @@ SKIP: {
$client->logout($id); $client->logout($id);
clean_sessions(); clean_sessions();
} }
count($mainTests); count($maintests);
done_testing( count() ); done_testing( count() );

8
lemonldap-ng-portal/t/28-AuthChoice.t
View File

@ -5,16 +5,16 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 2; my $maintests = 2;
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
skip 'LLNGTESTLDAP is not set', $mainTests unless ( $ENV{LLNGTESTLDAP} ); skip 'LLNGTESTLDAP is not set', $maintests unless ( $ENV{LLNGTESTLDAP} );
require 't/test-ldap.pm'; require 't/test-ldap.pm';
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
$dbh->do('CREATE TABLE users (user text,password text,name text)'); $dbh->do('CREATE TABLE users (user text,password text,name text)');
@ -73,7 +73,7 @@ SKIP: {
clean_sessions(); clean_sessions();
} }
count($mainTests); count($maintests);
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
stopLdapServer() if $ENV{LLNGTESTLDAP}; stopLdapServer() if $ENV{LLNGTESTLDAP};
clean_sessions(); clean_sessions();

8
lemonldap-ng-portal/t/30-SAML-ReAuth-with-choice.t
View File

@ -9,7 +9,7 @@ BEGIN {
} }
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
my $mainTests = 16; my $maintests = 16;
my $debug = 'error'; my $debug = 'error';
my ( $issuer, $sp, $res ); my ( $issuer, $sp, $res );
my %handlerOR = ( issuer => [], sp => [] ); my %handlerOR = ( issuer => [], sp => [] );
@ -17,11 +17,11 @@ my %handlerOR = ( issuer => [], sp => [] );
SKIP: { SKIP: {
eval "use Lasso"; eval "use Lasso";
if ($@) { if ($@) {
skip 'Lasso not found', $mainTests; skip 'Lasso not found', $maintests;
} }
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
$dbh->do('CREATE TABLE users (user text,password text,name text,uid text,cn text,mail text)'); $dbh->do('CREATE TABLE users (user text,password text,name text,uid text,cn text,mail text)');
@ -176,7 +176,7 @@ SKIP: {
clean_sessions(); clean_sessions();
} }
count($mainTests); count($maintests);
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/31-Auth-and-issuer-CAS-with-choice.t
View File

@ -8,7 +8,7 @@ BEGIN {
} }
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
my $mainTests = 14; my $maintests = 14;
my $debug = 'error'; my $debug = 'error';
my ( $issuer, $sp, $res ); my ( $issuer, $sp, $res );
my %handlerOR = ( issuer => [], sp => [] ); my %handlerOR = ( issuer => [], sp => [] );
@ -18,7 +18,7 @@ no warnings 'redefine';
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
$dbh->do( $dbh->do(
@ -163,7 +163,7 @@ SKIP: {
clean_sessions(); clean_sessions();
} }
count($mainTests); count($maintests);
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/32-Auth-and-issuer-OIDC-authorization_code-with-authchoice.t
View File

@ -8,14 +8,14 @@ BEGIN {
} }
my $debug = 'error'; my $debug = 'error';
my $mainTests = 18; my $maintests = 18;
my ( $op, $rp, $res ); my ( $op, $rp, $res );
my %handlerOR = ( op => [], rp => [] ); my %handlerOR = ( op => [], rp => [] );
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
$dbh->do('CREATE TABLE users (user text,password text,name text)'); $dbh->do('CREATE TABLE users (user text,password text,name text)');
@ -182,7 +182,7 @@ SKIP: {
#print STDERR Dumper($res); #print STDERR Dumper($res);
count($mainTests); count($maintests);
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/36-Combination-with-over.t
View File

@ -5,7 +5,7 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 0; my $maintests = 0;
my $client; my $client;
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
@ -13,7 +13,7 @@ eval { unlink 't/userdb.db' };
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
$dbh->do('CREATE TABLE users (user text,password text,name text)'); $dbh->do('CREATE TABLE users (user text,password text,name text)');
@ -24,7 +24,7 @@ SKIP: {
expectCookie( try('dwho') ); expectCookie( try('dwho') );
expectCookie( try('dvador') ); expectCookie( try('dvador') );
} }
count($mainTests); count($maintests);
clean_sessions(); clean_sessions();
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/36-Combination-with-token.t
View File

@ -5,7 +5,7 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 0; my $maintests = 0;
my $client; my $client;
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
@ -13,7 +13,7 @@ eval { unlink 't/userdb.db' };
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
$dbh->do('CREATE TABLE users (user text,password text,name text)'); $dbh->do('CREATE TABLE users (user text,password text,name text)');
@ -39,7 +39,7 @@ SKIP: {
expectCookie( try('dvador') ); expectCookie( try('dvador') );
expectReject( try('dwho'), 5 ); expectReject( try('dwho'), 5 );
} }
count($mainTests); count($maintests);
clean_sessions(); clean_sessions();
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/36-Combination.t
View File

@ -5,7 +5,7 @@ use IO::String;
require 't/test-lib.pm'; require 't/test-lib.pm';
my $res; my $res;
my $mainTests = 0; my $maintests = 0;
my $client; my $client;
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
@ -13,7 +13,7 @@ eval { unlink 't/userdb.db' };
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db"); my $dbh = DBI->connect("dbi:SQLite:dbname=t/userdb.db");
$dbh->do('CREATE TABLE users (user text,password text,name text)'); $dbh->do('CREATE TABLE users (user text,password text,name text)');
@ -39,7 +39,7 @@ SKIP: {
expectCookie( try('dvador') ); expectCookie( try('dvador') );
expectReject( try('dwho') ); expectReject( try('dwho') );
} }
count($mainTests); count($maintests);
clean_sessions(); clean_sessions();
eval { unlink 't/userdb.db' }; eval { unlink 't/userdb.db' };
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/40-Notifications-JSON-DBI.t
View File

@ -4,14 +4,14 @@ use IO::String;
my $res; my $res;
my $file = 't/notifications.db'; my $file = 't/notifications.db';
my $mainTests = 6; my $maintests = 6;
eval { unlink $file }; eval { unlink $file };
require 't/test-lib.pm'; require 't/test-lib.pm';
SKIP: { SKIP: {
eval { require DBI; require DBD::SQLite; }; eval { require DBI; require DBD::SQLite; };
if ($@) { if ($@) {
skip 'DBD::SQLite not found', $mainTests; skip 'DBD::SQLite not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=$file"); my $dbh = DBI->connect("dbi:SQLite:dbname=$file");
@ -122,6 +122,6 @@ q{INSERT INTO notifications VALUES ('dwho','testref','2016-05-30 00:00:00',?,nul
} }
count($mainTests); count($maintests);
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/40-Notifications-XML-DBI.t
View File

@ -4,7 +4,7 @@ use IO::String;
my $res; my $res;
my $file = 't/notifications.db'; my $file = 't/notifications.db';
my $mainTests = 6; my $maintests = 6;
eval { unlink $file }; eval { unlink $file };
require 't/test-lib.pm'; require 't/test-lib.pm';
@ -16,7 +16,7 @@ SKIP: {
require XML::LibXSLT; require XML::LibXSLT;
}; };
if ($@) { if ($@) {
skip 'DBD::SQLite or XML::Lib* not found', $mainTests; skip 'DBD::SQLite or XML::Lib* not found', $maintests;
} }
my $dbh = DBI->connect("dbi:SQLite:dbname=$file"); my $dbh = DBI->connect("dbi:SQLite:dbname=$file");
@ -121,6 +121,6 @@ qq{INSERT INTO notifications VALUES ('dwho','testref','2016-05-30 00:00:00','<?x
} }
count($mainTests); count($maintests);
done_testing( count() ); done_testing( count() );

6
lemonldap-ng-portal/t/40-Notifications-XML-File.t
View File

@ -6,12 +6,12 @@ require 't/test-lib.pm';
my $res; my $res;
my $file = 't/20160530_dwho_dGVzdHJlZg==.xml'; my $file = 't/20160530_dwho_dGVzdHJlZg==.xml';
my $mainTests = 6; my $maintests = 6;
SKIP: { SKIP: {
eval { require XML::LibXML; require XML::LibXSLT; }; eval { require XML::LibXML; require XML::LibXSLT; };
if ($@) { if ($@) {
skip 'XML::LibX* not found', $mainTests; skip 'XML::LibX* not found', $maintests;
} }
open F, "> $file" or die($!); open F, "> $file" or die($!);
@ -108,5 +108,5 @@ SKIP: {
} }
count($mainTests); count($maintests);
done_testing( count() ); done_testing( count() );