lib/deep_test/metrics/data.rb lib/deep_test/metrics/measurement.rb test/deep_test/metrics/data_test.rb test/deep_test/metrics/measurement_test.rb @@ -2,4 +2,5 @@ deep_test.metrics doc pkg tags +negative_acceptance_tests/metrics.data .gitignore @@ -34,7 +34,6 @@ end DeepTest::TestTask.new :deep_test do |t| t.pattern = "test/**/*_test.rb" - t.metrics_file = "deep_test.metrics" end DeepTest::TestTask.new(:manual_distributed_test) do |t| Rakefile @@ -65,6 +65,9 @@ require File.dirname(__FILE__) + "/deep_test/distributed/remote_deployment" require File.dirname(__FILE__) + "/deep_test/distributed/beachhead" require File.dirname(__FILE__) + "/deep_test/distributed/rsync" +require File.dirname(__FILE__) + "/deep_test/metrics/data" +require File.dirname(__FILE__) + "/deep_test/metrics/measurement" + DeepTest::RSpecDetector.if_rspec_available do require File.dirname(__FILE__) + "/deep_test/spec" end lib/deep_test.rb @@ -31,7 +31,9 @@ module DeepTest @listener.starting_work(self, work_unit_message.body) result = begin - work_unit_message.body.run + Metrics::Measurement.send_home("Agents Performing Work", @wire, @options) do + work_unit_message.body.run + end rescue Exception => error Error.new(work_unit_message.body, error) end @@ -44,15 +46,17 @@ module DeepTest end def next_work_unit_message - begin - message = @wire.next_message(:timeout => 2) - return message.body == CentralCommand::NoMoreWork ? nil : message - rescue Telegraph::NoMessageAvailable - DeepTest.logger.debug { "Agent: NoMessageAvailable" } - retry - rescue Telegraph::LineDead - DeepTest.logger.debug { "Agent: LineDead" } - return nil + Metrics::Measurement.send_home("Agents Retrieving Work", @wire, @options) do + begin + message = @wire.next_message(:timeout => 2) + next message.body == CentralCommand::NoMoreWork ? nil : message + rescue Telegraph::NoMessageAvailable + DeepTest.logger.debug { "Agent: NoMessageAvailable" } + retry + rescue Telegraph::LineDead + DeepTest.logger.debug { "Agent: LineDead" } + next nil + end end end lib/deep_test/agent.rb @@ -4,6 +4,7 @@ module DeepTest class CentralCommand attr_reader :operator attr_reader :switchboard + attr_reader :data def initialize(options) @options = options @@ -11,6 +12,7 @@ module DeepTest @results_mutex = Mutex.new @results_condvar = ConditionVariable.new @results = [] + @data = Metrics::Data.new end def done_with_work @@ -103,6 +105,8 @@ module DeepTest send_work wire when Operation message.body.execute + when Metrics::Measurement + data.add message.body else raise UnexpectedMessageError, message.inspect end @@ -149,6 +153,7 @@ module DeepTest @stop_process_messages = true operator.shutdown @process_messages_thread.join + data.save @options.metrics_file if @options.gathering_metrics? end class NoWorkUnitsAvailableError < StandardError; end lib/deep_test/central_command.rb @@ -41,6 +41,11 @@ DeepTest::TestTask.new :deep_test_with_work_taken_and_not_done do |t| t.pattern = "negative_acceptance_tests/passing_test.rb" end +DeepTest::TestTask.new :deep_test_with_metrics do |t| + t.pattern = "negative_acceptance_tests/passing_test.rb" + t.metrics_file = "negative_acceptance_tests/metrics.data" +end + Spec::Rake::SpecTask.new :deep_spec_failing do |t| t.deep_test :number_of_agents => 1 t.spec_files = FileList["negative_acceptance_tests/failing_spec.rb"] @@ -75,3 +80,8 @@ Spec::Rake::SpecTask.new :deep_spec_with_work_taken_and_not_done do |t| "negative_acceptance_tests/passing_test.rb"] t.deep_test :number_of_agents => 2, :listener => "KillAgentOneOnStartWork" end + +Spec::Rake::SpecTask.new :deep_spec_with_metrics do |t| + t.deep_test :number_of_agents => 1, :metrics_file => "negative_acceptance_tests/metrics.data" + t.spec_files = FileList["negative_acceptance_tests/passing_spec.rb"] +end negative_acceptance_tests/tasks.rake @@ -37,7 +37,17 @@ unit_tests do test "#{framework}: DeepTest with work taken and not done" do result, output = run_rake framework, :with_work_taken_and_not_done - assert_equal true, result.success? + assert_equal true, result.success?, output + end + + test "#{framework}: DeepTest with metrics" do + FileUtils.rm_f "negative_acceptance_tests/metrics.data" + result, output = run_rake framework, :with_metrics + assert_equal true, result.success?, output + metrics = File.read("negative_acceptance_tests/metrics.data") + assert_match /Metrics Data/, metrics + assert_match /Agents Performing Work:/, metrics + assert_match /Agents Retrieving Work:/, metrics end end negative_acceptance_tests/tests.rb @@ -93,7 +93,7 @@ module DeepTest assert_equal TestResult.new(1), central_command.take_result end - test "will distributed work units that have not received results from dead workers when other work runs out" do + test "will distribute work units that have not received results from dead workers when other work runs out" do central_command = CentralCommand.start(options = Options.new({})) DynamicTeardown.on_teardown { central_command.stop } @@ -110,6 +110,19 @@ module DeepTest end end + test "will add measurements to data when received over the wire" do + central_command = CentralCommand.start(options = Options.new({})) + DynamicTeardown.on_teardown { central_command.stop } + + Telegraph::Wire.connect("localhost", options.server_port) do |wire| + wire.send_message Metrics::Measurement.new("category", 1, "units") + end + + sleep 0.05 + + assert_match /category: 1.0 avg/, central_command.data.summary + end + class SetCalledGlobalToTrue include CentralCommand::Operation def execute; $called = true; end test/deep_test/central_command_test.rb be69a521b54b8b8dab60c76e54928a5f7c7fff34 qxjit (David Vollbracht) david.vollbracht@gmail.com http://github.com/qxjit/deep-test/commit/694b08637be87617778116b8570d514224893313 694b08637be87617778116b8570d514224893313 2009-07-31T20:38:25-07:00 2009-07-31T20:38:25-07:00 add metrics gathering around workers doing working and retrieving work 920e7e7ec5d93eaee26d265df257d77875fc2bbd qxjit (David Vollbracht) david.vollbracht@gmail.com