From 69ac6cfbdaf9cbb25a0f73561d92a3d69accb434 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
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 ++++----------
 t/test-custodian-parser.rb         |  8 ++++----
 2 files changed, 8 insertions(+), 14 deletions(-)

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
diff --git a/t/test-custodian-parser.rb b/t/test-custodian-parser.rb
index 843dc80..2239503 100755
--- a/t/test-custodian-parser.rb
+++ b/t/test-custodian-parser.rb
@@ -438,12 +438,12 @@ EOF
     # test data
     #
     data = {
-      'http://example must run http with auth "bob:steve".'  =>
+      'http://bob:steve@example must run http.'  =>
       { username: 'bob', password: 'steve'},
-      'http://example must run http with auth "stee\':steve".' =>
+      'http://stee\':steve@example must run http.' =>
       { username: 'stee\'', password: 'steve'},
-      'http://example must run http with auth \'e"e:pa$$w0rd\'.' =>
-      { username: 'e"e', password: 'pa$$w0rd'},
+      'http://e\'e:pa$$w0rd@example must run http.' =>
+      { username: 'e\'e', password: 'pa$$w0rd'},
     }
 
     data.each do |str, hash |
-- 
cgit v1.2.1