From 69ac6cfbdaf9cbb25a0f73561d92a3d69accb434 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Mon, 10 Apr 2017 10:41:50 +0300 Subject: Use standard URL username/password holders. Rather than: with auth 'username:password' We use: http://user:pass@example.com/ --- lib/custodian/protocoltest/http.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib/custodian/protocoltest/http.rb') diff --git a/lib/custodian/protocoltest/http.rb b/lib/custodian/protocoltest/http.rb index 34e4b6e..a4c4adb 100644 --- a/lib/custodian/protocoltest/http.rb +++ b/lib/custodian/protocoltest/http.rb @@ -102,18 +102,12 @@ module Custodian raise ArgumentError, "The test case has a different protocol in the URI than that which we're testing: #{@line} - \"#{test_type} != #{u.scheme}\"" end - # - # Look for username & password + # Save username/password if they were specified # - if line =~ /with auth '([^']+)'/ - data = $1.dup - @username, @password = data.split( ":" ) - end - if line =~ /with auth "([^"]+)"/ - data = $1.dup - @username, @password = data.split( ":" ) - end + @username = u.user if ( u.user ) + @password = u.password if ( u.password ) + # # Expected status -- cgit v1.2.1