From 0f0a73d6ecb4ab3a3daf6c2988d3bcaeb084f361 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <yadd@debian.org>
Date: Thu, 23 Apr 2020 15:36:48 +0200
Subject: [PATCH] Update combination tests

---
 .../t/36-Combination-with-Choice.t            | 22 +++++++++----------
 .../t/36-Combination-with-over.t              |  4 ++--
 .../t/36-Combination-with-token.t             | 14 ++++++------
 lemonldap-ng-portal/t/36-Combination.t        |  8 +++----
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lemonldap-ng-portal/t/36-Combination-with-Choice.t b/lemonldap-ng-portal/t/36-Combination-with-Choice.t
index 432765677..f0f5ba166 100644
--- a/lemonldap-ng-portal/t/36-Combination-with-Choice.t
+++ b/lemonldap-ng-portal/t/36-Combination-with-Choice.t
@@ -21,25 +21,25 @@ SKIP: {
     $dbh->do("INSERT INTO users VALUES ('rtyler','rtyler','Test user 1')");
 
     $client = iniCmb('[Dm] or [Ch]');
-    expectCookie( try('dwho') );
-    expectCookie( try( 'dvador', 'sql' ) );
+    $client->logout( expectCookie( try('dwho') ) );
+    $client->logout( expectCookie( try( 'dvador', 'sql' ) ) );
 
     $client = iniCmb('[Dm] and [Ch]');
-    expectCookie( try( 'rtyler', 'sql' ) );
-    expectCookie( try( 'dwho',   'demo' ) );
-    expectReject( try( 'dwho',   'sql' ) );
+    $client->logout( expectCookie( try( 'rtyler', 'sql' ) ) );
+    $client->logout( expectCookie( try( 'dwho',   'demo' ) ) );
+    expectReject( try( 'dwho', 'sql' ) );
 
     $client = iniCmb('if($env->{HTTP_X} eq "dwho") then [Dm] else [Ch]');
-    expectCookie( try('dwho') );
-    expectCookie( try( 'dvador', 'sql' ) );
+    $client->logout( expectCookie( try('dwho') ) );
+    $client->logout( expectCookie( try( 'dvador', 'sql' ) ) );
 
     $client = iniCmb(
 'if($env->{HTTP_X} eq "rtyler") then [Dm] and [Ch] else if($env->{HTTP_X} eq "dvador") then [Ch] else [Ch]'
     );
-    expectCookie( try( 'rtyler', 'sql' ) );
-    expectCookie( try( 'dvador', 'sql' ) );
-    expectCookie( try( 'dwho',   'demo' ) );
-    expectReject( try( 'dwho',   'sql' ) );
+    $client->logout( expectCookie( try( 'rtyler', 'sql' ) ) );
+    $client->logout( expectCookie( try( 'dvador', 'sql' ) ) );
+    $client->logout( expectCookie( try( 'dwho',   'demo' ) ) );
+    expectReject( try( 'dwho', 'sql' ) );
 }
 count($maintests);
 clean_sessions();
diff --git a/lemonldap-ng-portal/t/36-Combination-with-over.t b/lemonldap-ng-portal/t/36-Combination-with-over.t
index 870ce9058..a210b66e0 100644
--- a/lemonldap-ng-portal/t/36-Combination-with-over.t
+++ b/lemonldap-ng-portal/t/36-Combination-with-over.t
@@ -21,8 +21,8 @@ SKIP: {
     $dbh->do("INSERT INTO users VALUES ('rtyler','rtyler','Test user 1')");
 
     $client = iniCmb('[Dm] or [DB]');
-    expectCookie( try('dwho') );
-    expectCookie( try('dvador') );
+    $client->logout( expectCookie( try('dwho') ) );
+    $client->logout( expectCookie( try('dvador') ) );
 }
 count($maintests);
 clean_sessions();
diff --git a/lemonldap-ng-portal/t/36-Combination-with-token.t b/lemonldap-ng-portal/t/36-Combination-with-token.t
index 57b3aa70d..89db7d18f 100644
--- a/lemonldap-ng-portal/t/36-Combination-with-token.t
+++ b/lemonldap-ng-portal/t/36-Combination-with-token.t
@@ -21,22 +21,22 @@ SKIP: {
     $dbh->do("INSERT INTO users VALUES ('rtyler','rtyler','Test user 1')");
 
     $client = iniCmb('[Dm] or [DB]');
-    expectCookie( try('dwho') );
-    expectCookie( try('dvador') );
+    $client->logout( expectCookie( try('dwho') ) );
+    $client->logout( expectCookie( try('dvador') ) );
 
     $client = iniCmb('[Dm] and [DB]');
-    expectCookie( try('rtyler') );
+    $client->logout( expectCookie( try('rtyler') ) );
     expectReject( try('dwho'), 401, 5 );
 
     $client = iniCmb('if($env->{HTTP_X} eq "dwho") then [Dm] else [DB]');
-    expectCookie( try('dwho') );
-    expectCookie( try('dvador') );
+    $client->logout( expectCookie( try('dwho') ) );
+    $client->logout( expectCookie( try('dvador') ) );
 
     $client = iniCmb(
 'if($env->{HTTP_X} eq "rtyler") then [Dm] and [DB] else if($env->{HTTP_X} eq "dvador") then [DB] else [DB]'
     );
-    expectCookie( try('rtyler') );
-    expectCookie( try('dvador') );
+    $client->logout( expectCookie( try('rtyler') ) );
+    $client->logout( expectCookie( try('dvador') ) );
     expectReject( try('dwho'), 401, 5 );
 }
 count($maintests);
diff --git a/lemonldap-ng-portal/t/36-Combination.t b/lemonldap-ng-portal/t/36-Combination.t
index 99a7cc75d..88b6c9a13 100644
--- a/lemonldap-ng-portal/t/36-Combination.t
+++ b/lemonldap-ng-portal/t/36-Combination.t
@@ -21,16 +21,16 @@ SKIP: {
     $dbh->do("INSERT INTO users VALUES ('rtyler','rtyler','Test user 1')");
 
     $client = iniCmb('[Dm] or [DB]');
-    expectCookie( try('dwho') );
+    $client->logout( expectCookie( try('dwho') ) );
     expectCookie( try('dvador') );
 
     $client = iniCmb('[Dm] and [DB]');
-    expectCookie( try('rtyler') );
+    $client->logout( expectCookie( try('rtyler') ) );
     expectReject( try('dwho') );
 
     $client = iniCmb('if($env->{HTTP_X} eq "dwho") then [Dm] else [DB]');
-    expectCookie( try('dwho') );
-    expectCookie( try('dvador') );
+    $client->logout( expectCookie( try('dwho') ) );
+    $client->logout( expectCookie( try('dvador') ) );
 
     $client = iniCmb(
 'if($env->{HTTP_X} eq "rtyler") then [Dm] and [DB] else if($env->{HTTP_X} eq "dvador") then [DB] else [DB]'