testotron 0.0.3 → 0.0.4

data/lib/test.rb

@@ -1,4 +1,7 @@
 module Testotron
+	class TestFailed < Exception
+	end
+
 	class Test
 	end
 end

data/lib/testotron.rb

@@ -9,9 +9,6 @@ require 'tests/http'
 require 'tests/smtp'
 
 module Testotron
-	class TestFailed < Exception
-	end
-	
 	TEST_CLASSES = [ Tests::HTTP, Tests::SMTP ]
 
 	class TestBuilder
@@ -27,23 +24,57 @@ module Testotron
 				begin
 					test.run(@runner)
 				rescue TestFailed => failure
-					@runner.report_error(@report_methods, test, failure)
+					complain(test, failure)
 				end
 			end
 		}
 
+		def complain(test, failure)
+			if @complaint_block
+				@complaint_block.call(test, failure)
+			end
+			@runner.report_error(@report_methods, test, failure)
+		end
+
 		def report_with(*methods)
+			methods = methods.first if methods.length == 1
+			methods = [methods] unless methods.is_a? Array
 			@report_methods = methods.map &:to_sym
 		end
+
+		def complain_using(&block)
+			raise ArgumentError, "No block given to complain to" unless block
+			@complaint_block = block
+		end
+
+		def quiet
+			@runner.quiet
+		end
+
+		def quiet=(value)
+			@runner.quiet = value
+		end
+
+		def quiet!
+			quiet = true
+		end
 	end
 
 	# TODO: set mail target
 	class TestRunner
 		def report(test, msg)
-			puts test.class.to_s.rjust(20) + ": #{msg}"
+			unless @quiet
+				puts test.class.to_s.rjust(20) + ": #{msg}"
+			end
+		end
+
+		attr_accessor :quiet
+
+		def initialize
+			@quiet = false
 		end
 
-		REPORT_METHODS = [ :local_mail, :stderr, :xosdutil ]
+		VALID_REPORT_METHODS = [ :local_mail, :stderr, :xosdutil ]
 
 		def report_error(methods, test, failure)
 			if methods.include?(:local_mail)
@@ -76,6 +107,7 @@ EOF
 
 	def self.test(*args)
 		runner = TestRunner.new
+		runner.quiet = true
 
 		if block_given?
 			yield(TestBuilder.new(runner))

data/lib/tests/http.rb

@@ -1,37 +1,45 @@
 require 'test'
 
-module Testotron::Tests
-	class HTTP < Testotron::Test
-		KEY = "http"
+module Testotron
+	module Tests
+		class HTTP < Test
+			KEY = "http"
 
-		def initialize(host, port = 80, requests = nil)
-			if requests.nil?
-				requests = "http://#{host}/"
+			def initialize(host, port = 80, requests = nil)
+				if requests.nil?
+					requests = "http://#{host}/"
+				end
+				@host, @port, @requests = host, port, [*requests]
 			end
-			@host, @port, @requests = host, port, [*requests]
-		end
 
-		def human_name
-			"HTTP test of #{@host}, port #{@port}, requests #{@requests.join ','}"
-		end
+			def human_name
+				"HTTP test of #{@host}, port #{@port}, requests #{@requests.join ','}"
+			end
 
-		def run(runner)
-			runner.report self, "Testing HTTP server on #{@host} port #{@port}..."
-			http = Net::HTTP.new(@host, @port)
-			@requests.each do |page|
-				runner.report self, "Trying #{page}..."
-				request = Net::HTTP::Get.new URI.parse(page).request_uri
+			def run(runner)
+				runner.report self, "Testing HTTP server on #{@host} port #{@port}..."
+				http = Net::HTTP.new(@host, @port)
+				http.read_timeout = 2
+				http.open_timeout = 2
+				@requests.each do |page|
+					runner.report self, "Trying #{page}..."
+					request = Net::HTTP::Get.new URI.parse(page).request_uri
 
-				begin
-					response = http.request(request)
-				rescue Errno::ETIMEDOUT
-					raise TestFailed, "HTTP connection timed out"
-				rescue Errno::ECONNREFUSED
-					raise TestFailed, "HTTP connection refused"
-				end
+					begin
+						response = http.request(request)
+					rescue Errno::ETIMEDOUT
+						raise TestFailed, "HTTP connection timed out"
+					rescue Errno::ECONNREFUSED
+						raise TestFailed, "HTTP connection refused"
+					rescue SocketError
+						raise TestFailed, "HTTP connection failed (SocketError)"
+					end
 
-				if response.code.to_i != 200
-					raise TestFailed, "Response not 200 on #{@post}:#{@port} GET #{page}"
+					good_codes = 100...400
+					code = response.code.to_i
+					unless good_codes.include? code
+						raise TestFailed, "Response code #{code} on #{@post}:#{@port} GET #{page}"
+					end
 				end
 			end
 		end

data/lib/tests/smtp.rb

@@ -1,29 +1,33 @@
 require 'test'
 
-module Testotron::Tests
-	class SMTP < Testotron::Test
-		KEY = "smtp"
+module Testotron
+	module Tests
+		class SMTP < Test
+			KEY = "smtp"
 
-		def initialize(host, port = 25)
-			@host, @port = host, port
-		end
+			def initialize(host, port = 25)
+				@host, @port = host, port
+			end
 
-		def human_name
-			"SMTP test of #{@host}, port #{@port}"
-		end
+			def human_name
+				"SMTP test of #{@host}, port #{@port}"
+			end
 
-		def run(runner)
-			runner.report self, "Testing SMTP server of #{@host} port #{@port}..."
-			smtp = Net::SMTP.new(@host, @port)
-			begin
-				smtp.start
-				smtp.finish
-			rescue Errno::ECONNREFUSED => e
-				raise TestFailed, "Server refused SMTP connection"
-			rescue EOFError => e
-				raise TestFailed, "EOF reached while connecting to SMTP server"
-			rescue Exception
-				raise TestFailed
+			def run(runner)
+				runner.report self, "Testing SMTP server of #{@host} port #{@port}..."
+				smtp = Net::SMTP.new(@host, @port)
+				smtp.read_timeout = 2
+				smtp.open_timeout = 2
+				begin
+					smtp.start
+					smtp.finish
+				rescue Errno::ECONNREFUSED => e
+					raise TestFailed, "Server refused SMTP connection"
+				rescue EOFError => e
+					raise TestFailed, "EOF reached while connecting to SMTP server"
+				rescue Exception
+					raise TestFailed
+				end
 			end
 		end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testotron
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: