From 85e9b0f0fb71779cb5818af991da7a5c95084ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Deltombe?= Date: Fri, 16 May 2014 13:29:12 +0000 Subject: [PATCH] Fix unit test by setting LLNG_DEFAULTCONFFILE as a filename, not a file descriptor --- lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-DefaultHandler.t | 2 +- lemonldap-ng-handler/t/30-Lemonldap-NG-Handler-CGI.t | 2 +- lemonldap-ng-handler/t/50-Lemonldap-NG-Handler-SecureToken.t | 2 +- lemonldap-ng-handler/t/51-Lemonldap-NG-Handler-Zimbra.t | 2 +- lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t | 2 +- lemonldap-ng-manager/t/10-Manager.t | 2 +- lemonldap-ng-manager/t/40-Manager-Sessions.t | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-DefaultHandler.t b/lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-DefaultHandler.t index eef7b9ad4..626f22a25 100644 --- a/lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-DefaultHandler.t +++ b/lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-DefaultHandler.t @@ -40,7 +40,7 @@ localStorageOptions={ \\ $ini->flush(); use Env qw(LLNG_DEFAULTCONFFILE); -$LLNG_DEFAULTCONFFILE = $ini; +$LLNG_DEFAULTCONFFILE = $ini->filename; open STDERR, '>/dev/null'; diff --git a/lemonldap-ng-handler/t/30-Lemonldap-NG-Handler-CGI.t b/lemonldap-ng-handler/t/30-Lemonldap-NG-Handler-CGI.t index 68e7f131e..d76f4da61 100644 --- a/lemonldap-ng-handler/t/30-Lemonldap-NG-Handler-CGI.t +++ b/lemonldap-ng-handler/t/30-Lemonldap-NG-Handler-CGI.t @@ -23,7 +23,7 @@ dirName=$dir $ini->flush(); use Env qw(LLNG_DEFAULTCONFFILE); -$LLNG_DEFAULTCONFFILE = $ini; +$LLNG_DEFAULTCONFFILE = $ini->filename; use_ok('Lemonldap::NG::Handler::CGI'); diff --git a/lemonldap-ng-handler/t/50-Lemonldap-NG-Handler-SecureToken.t b/lemonldap-ng-handler/t/50-Lemonldap-NG-Handler-SecureToken.t index 73e4069f3..c3a906972 100644 --- a/lemonldap-ng-handler/t/50-Lemonldap-NG-Handler-SecureToken.t +++ b/lemonldap-ng-handler/t/50-Lemonldap-NG-Handler-SecureToken.t @@ -23,7 +23,7 @@ dirName=$dir $ini->flush(); use Env qw(LLNG_DEFAULTCONFFILE); -$LLNG_DEFAULTCONFFILE = $ini; +$LLNG_DEFAULTCONFFILE = $ini->filename; ######################### diff --git a/lemonldap-ng-handler/t/51-Lemonldap-NG-Handler-Zimbra.t b/lemonldap-ng-handler/t/51-Lemonldap-NG-Handler-Zimbra.t index 6554cd976..0bc6f3694 100644 --- a/lemonldap-ng-handler/t/51-Lemonldap-NG-Handler-Zimbra.t +++ b/lemonldap-ng-handler/t/51-Lemonldap-NG-Handler-Zimbra.t @@ -23,7 +23,7 @@ dirName=$dir $ini->flush(); use Env qw(LLNG_DEFAULTCONFFILE); -$LLNG_DEFAULTCONFFILE = $ini; +$LLNG_DEFAULTCONFFILE = $ini->filename; ######################### diff --git a/lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t b/lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t index 007c85b8d..0beb2daaf 100644 --- a/lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t +++ b/lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t @@ -23,7 +23,7 @@ dirName=$dir $ini->flush(); use Env qw(LLNG_DEFAULTCONFFILE); -$LLNG_DEFAULTCONFFILE = $ini; +$LLNG_DEFAULTCONFFILE = $ini->filename; ######################### diff --git a/lemonldap-ng-manager/t/10-Manager.t b/lemonldap-ng-manager/t/10-Manager.t index 033e22cae..177f53d1a 100644 --- a/lemonldap-ng-manager/t/10-Manager.t +++ b/lemonldap-ng-manager/t/10-Manager.t @@ -25,7 +25,7 @@ dirName=$dir $ini->flush(); use Env qw(LLNG_DEFAULTCONFFILE); -$LLNG_DEFAULTCONFFILE = $ini; +$LLNG_DEFAULTCONFFILE = $ini->filename; use_ok('Lemonldap::NG::Manager'); diff --git a/lemonldap-ng-manager/t/40-Manager-Sessions.t b/lemonldap-ng-manager/t/40-Manager-Sessions.t index 943bd3270..b45604e6c 100644 --- a/lemonldap-ng-manager/t/40-Manager-Sessions.t +++ b/lemonldap-ng-manager/t/40-Manager-Sessions.t @@ -24,7 +24,7 @@ dirName=$dir $ini->flush(); use Env qw(LLNG_DEFAULTCONFFILE); -$LLNG_DEFAULTCONFFILE = $ini; +$LLNG_DEFAULTCONFFILE = $ini->filename; use_ok('Lemonldap::NG::Manager::Sessions');