diff options
author | Steve Kemp <steve@steve.org.uk> | 2012-11-22 15:40:07 +0000 |
---|---|---|
committer | Steve Kemp <steve@steve.org.uk> | 2012-11-22 15:40:07 +0000 |
commit | 667f375bc19540ec9cb388b70a9c22f20bf8ea99 (patch) | |
tree | ec730da0357dac37cc82688dfbfd6351b6b6c1a0 | |
parent | 8cd8125b071f4a0be8ec05d40471da6821067b07 (diff) |
"ftp://ftp.example.com/ must run ftp" + "rsync://...../" are now both permitted.
-rw-r--r-- | TODO | 6 | ||||
-rw-r--r-- | lib/custodian/protocoltest/rsync.rb | 4 | ||||
-rwxr-xr-x | t/test-factory.rb | 5 |
3 files changed, 9 insertions, 6 deletions
@@ -8,9 +8,3 @@ Use a class factory to instantiate tests on the worker-side. The HTTP/HTTPS-probe should be pure Ruby. Patrick will give me a stub. - -allow rsync://hostnaem for rsync test - -allow ftp://ftp.uk.mirror.bytarmk.co.uk for ftp test - - diff --git a/lib/custodian/protocoltest/rsync.rb b/lib/custodian/protocoltest/rsync.rb index 8b4e84c..293f67c 100644 --- a/lib/custodian/protocoltest/rsync.rb +++ b/lib/custodian/protocoltest/rsync.rb @@ -52,6 +52,10 @@ module Custodian # Save the host # @host = line.split( /\s+/)[0] + if ( @host =~ /^rsync:\/\/([^\/]+)\/?/ ) + @host = $1.dup + end + # # Save the port diff --git a/t/test-factory.rb b/t/test-factory.rb index 4a941b2..7ef44b1 100755 --- a/t/test-factory.rb +++ b/t/test-factory.rb @@ -47,6 +47,11 @@ class TestTestFactory < Test::Unit::TestCase assert( Custodian::TestFactory.create( "ftp://ftp.example.com/ must run ftp." ).target() == "ftp.example.com" ) + + assert( Custodian::TestFactory.create( "rsync.example.com must run rsync." ).target() == "rsync.example.com" ) + assert( Custodian::TestFactory.create( "rsync://rsync.example.com/ must run rsync." ).target() == "rsync.example.com" ) + + end |