From 327672dedd6d308e594618c768f74e0b0ad1c6c4 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Sat, 24 Nov 2012 18:56:13 +0000 Subject: Renamed 'custodian/protocoltest.rb' -> 'custodian/protocoltests.rb' to match what we did with the alerts. --- lib/custodian/parser.rb | 2 +- lib/custodian/protocoltest.rb | 29 ----------------------------- lib/custodian/protocoltests.rb | 29 +++++++++++++++++++++++++++++ lib/custodian/worker.rb | 2 +- t/test-custodian-testfactory.rb | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 lib/custodian/protocoltest.rb create mode 100644 lib/custodian/protocoltests.rb diff --git a/lib/custodian/parser.rb b/lib/custodian/parser.rb index 396deb6..0ebf667 100644 --- a/lib/custodian/parser.rb +++ b/lib/custodian/parser.rb @@ -7,7 +7,7 @@ require 'uri' # # This list of all our protocol tests. # -require 'custodian/protocoltest' +require 'custodian/protocoltests' diff --git a/lib/custodian/protocoltest.rb b/lib/custodian/protocoltest.rb deleted file mode 100644 index 2d6a5fc..0000000 --- a/lib/custodian/protocoltest.rb +++ /dev/null @@ -1,29 +0,0 @@ -# -# This is just a helper which means that you'll only need to -# update the list of requires in one place if you add a new -# test-type. -# -# - - - -# -# The individual protocol tests. -# -require 'custodian/protocoltest/tcp' -require 'custodian/protocoltest/dns' -require 'custodian/protocoltest/ftp' -require 'custodian/protocoltest/http' -require 'custodian/protocoltest/jabber' -require 'custodian/protocoltest/ldap' -require 'custodian/protocoltest/ping' -require 'custodian/protocoltest/pop3' -require 'custodian/protocoltest/rsync' -require 'custodian/protocoltest/ssh' -require 'custodian/protocoltest/smtp' - - -# -# The factory -# -require 'custodian/testfactory' diff --git a/lib/custodian/protocoltests.rb b/lib/custodian/protocoltests.rb new file mode 100644 index 0000000..2d6a5fc --- /dev/null +++ b/lib/custodian/protocoltests.rb @@ -0,0 +1,29 @@ +# +# This is just a helper which means that you'll only need to +# update the list of requires in one place if you add a new +# test-type. +# +# + + + +# +# The individual protocol tests. +# +require 'custodian/protocoltest/tcp' +require 'custodian/protocoltest/dns' +require 'custodian/protocoltest/ftp' +require 'custodian/protocoltest/http' +require 'custodian/protocoltest/jabber' +require 'custodian/protocoltest/ldap' +require 'custodian/protocoltest/ping' +require 'custodian/protocoltest/pop3' +require 'custodian/protocoltest/rsync' +require 'custodian/protocoltest/ssh' +require 'custodian/protocoltest/smtp' + + +# +# The factory +# +require 'custodian/testfactory' diff --git a/lib/custodian/worker.rb b/lib/custodian/worker.rb index 1f72eec..56dcbed 100644 --- a/lib/custodian/worker.rb +++ b/lib/custodian/worker.rb @@ -19,7 +19,7 @@ require 'custodian/settings' # # This list of all our protocol tests. # -require 'custodian/protocoltest' +require 'custodian/protocoltests' diff --git a/t/test-custodian-testfactory.rb b/t/test-custodian-testfactory.rb index b210ef9..a14fce9 100755 --- a/t/test-custodian-testfactory.rb +++ b/t/test-custodian-testfactory.rb @@ -3,7 +3,7 @@ require 'test/unit' -require 'custodian/protocoltest' +require 'custodian/protocoltests' -- cgit v1.2.1