Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Xavier Bachelot
lemonldap-ng
Commits
773ccfe7
Commit
773ccfe7
authored
Jan 12, 2016
by
Yadd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid some warnings
parent
46b986a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm
...ldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm
+1
-1
lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-SharedConf.t
lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-SharedConf.t
+2
-1
No files found.
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Serializer.pm
View file @
773ccfe7
...
@@ -99,7 +99,7 @@ sub unserialize {
...
@@ -99,7 +99,7 @@ sub unserialize {
$conf
->
{
$k
}
=
(
$v
=~
/./
?
eval
{
from_json
(
$v
)
}
:
{}
);
$conf
->
{
$k
}
=
(
$v
=~
/./
?
eval
{
from_json
(
$v
)
}
:
{}
);
if
(
$@
)
{
if
(
$@
)
{
$
Lemonldap::NG::Common::Conf::
msg
.=
$
Lemonldap::NG::Common::Conf::
msg
.=
"
Unable to decode
$k
,
probably old format. Trying... ($@)
";
"
Unable to decode
$k
,
switching to old format.
\n
";
return
$self
->
oldUnserialize
(
$fields
);
return
$self
->
oldUnserialize
(
$fields
);
}
}
}
}
...
...
lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-SharedConf.t
View file @
773ccfe7
...
@@ -49,6 +49,7 @@ $LLNG_DEFAULTCONFFILE = $ini->filename;
...
@@ -49,6 +49,7 @@ $LLNG_DEFAULTCONFFILE = $ini->filename;
# Insert your test code below, the Test::More module is use()ed here so read
# Insert your test code below, the Test::More module is use()ed here so read
# its man page ( perldoc Test::More ) for help writing this test script.
# its man page ( perldoc Test::More ) for help writing this test script.
$
Lemonldap::NG::Handler::API::
logLevel
=
'
error
';
use_ok
('
Lemonldap::NG::Handler
');
use_ok
('
Lemonldap::NG::Handler
');
if
(
$numTests
==
3
)
{
if
(
$numTests
==
3
)
{
...
@@ -62,7 +63,7 @@ if ( $numTests == 3 ) {
...
@@ -62,7 +63,7 @@ if ( $numTests == 3 ) {
my
$ret
;
my
$ret
;
$mock
->
fake_module
(
$mock
->
fake_module
(
'
Lemonldap::NG::Handler::API
',
'
Lemonldap::NG::Handler::API
',
newRequest
=>
sub
{
print
STDERR
"
newRequest
\n
"
},
newRequest
=>
sub
{
1
},
header_in
=>
sub
{
""
},
header_in
=>
sub
{
""
},
hostname
=>
sub
{
'
test.example.com
'
},
hostname
=>
sub
{
'
test.example.com
'
},
is_initial_req
=>
sub
{
'
1
'
},
is_initial_req
=>
sub
{
'
1
'
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment