diff options
| author | Steve Kemp <steve@steve.org.uk> | 2012-11-24 12:35:29 +0000 |
|---|---|---|
| committer | Steve Kemp <steve@steve.org.uk> | 2012-11-24 12:35:29 +0000 |
| commit | 2539acc1889fb39951f9c6c2b204d8c4d20691c0 (patch) | |
| tree | 207f6fbf8c2d0ddaabd2afba1daa90a372168f0c | |
| parent | 18be29d306d682421a7fb70b7108b455781c53cb (diff) | |
Move the protocol-test includes into a single file to avoid duplication.
| -rw-r--r-- | lib/custodian/worker.rb | 17 | ||||
| -rwxr-xr-x | t/test-custodian-testfactory.rb | 11 |
2 files changed, 6 insertions, 22 deletions
diff --git a/lib/custodian/worker.rb b/lib/custodian/worker.rb index 9c9e8ec..221576e 100644 --- a/lib/custodian/worker.rb +++ b/lib/custodian/worker.rb @@ -12,18 +12,11 @@ require 'logger' # Our modules. # require 'custodian/alerter.rb' -require 'custodian/testfactory' - -require 'custodian/protocoltest/tcp.rb' -require 'custodian/protocoltest/dns.rb' -require 'custodian/protocoltest/ftp.rb' -require 'custodian/protocoltest/http.rb' -require 'custodian/protocoltest/jabber.rb' -require 'custodian/protocoltest/ldap.rb' -require 'custodian/protocoltest/ping.rb' -require 'custodian/protocoltest/rsync.rb' -require 'custodian/protocoltest/ssh.rb' -require 'custodian/protocoltest/smtp.rb' + +# +# This list of all our protocol tests. +# +require 'custodian/protocoltest' diff --git a/t/test-custodian-testfactory.rb b/t/test-custodian-testfactory.rb index b016289..dd39ee1 100755 --- a/t/test-custodian-testfactory.rb +++ b/t/test-custodian-testfactory.rb @@ -3,16 +3,7 @@ require 'test/unit' -require 'custodian/protocoltest/tcp.rb' -require 'custodian/protocoltest/dns.rb' -require 'custodian/protocoltest/ftp.rb' -require 'custodian/protocoltest/http.rb' -require 'custodian/protocoltest/jabber.rb' -require 'custodian/protocoltest/ldap.rb' -require 'custodian/protocoltest/ping.rb' -require 'custodian/protocoltest/rsync.rb' -require 'custodian/protocoltest/ssh.rb' -require 'custodian/protocoltest/smtp.rb' +require 'custodian/protocoltest' |