From 7580cbda9e78ca6da0dc717f2a190a21ffc34468 Mon Sep 17 00:00:00 2001 From: Mason James Date: Wed, 3 May 2017 13:15:43 +1200 Subject: [PATCH] t/Token.t merge typo fix modified: t/Token.t --- t/Token.t | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/t/Token.t b/t/Token.t index 6ba5b7eb98..2314d2ebba 100644 --- a/t/Token.t +++ b/t/Token.t @@ -51,16 +51,11 @@ isnt( $result, 1, "This token is no CSRF token" ); # Test MaxAge parameter my $age = 1; # 1 second $result = $tokenizer->check_csrf({ -<<<<<<< HEAD session_id => $id, token => $csrftoken, MaxAge => $age, -======= - id => $id, secret => $secr, token => $csrftoken, MaxAge => $age, ->>>>>>> Bug 17110: Add unit test for MaxAge parameter in Token.t }); is( $result, 1, "CSRF token still valid within one second" ); usleep $age * 1000000 * 2; # micro (millionth) seconds + 100% $result = $tokenizer->check_csrf({ -<<<<<<< HEAD session_id => $id, token => $csrftoken, MaxAge => $age, }); isnt( $result, 1, "CSRF token expired after one second" ); @@ -94,8 +89,3 @@ subtest 'Same logged in user with another session (cookie CGISESSID)' => sub { }); is( $result, '', "CSRF token is not verified if another session is used" ); }; -======= - id => $id, secret => $secr, token => $csrftoken, MaxAge => $age, -}); -isnt( $result, 1, "CSRF token expired after one second" ); ->>>>>>> Bug 17110: Add unit test for MaxAge parameter in Token.t -- 2.39.5