summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2012-11-22 15:40:07 +0000
committerSteve Kemp <steve@steve.org.uk>2012-11-22 15:40:07 +0000
commit9939c9f857d63e299a140b0e0dadc1b488129579 (patch)
treeec730da0357dac37cc82688dfbfd6351b6b6c1a0
parent918d964adee64d0a14fc80797def1070c39061b3 (diff)
"ftp://ftp.example.com/ must run ftp" + "rsync://...../" are now both permitted.
-rw-r--r--TODO6
-rw-r--r--lib/custodian/protocoltest/rsync.rb4
-rwxr-xr-xt/test-factory.rb5
3 files changed, 9 insertions, 6 deletions
diff --git a/TODO b/TODO
index 2801d25..0b904e0 100644
--- a/TODO
+++ b/TODO
@@ -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