jstorimer-deep-test 0.2.0 → 1.0.0

data/lib/deep_test.rb

@@ -3,15 +3,27 @@ module DeepTest
     def logger
       @logger ||= DeepTest::Logger.new($stdout)
     end
-
-    def logger=(logger)
-      @logger = logger
-    end
   end  
 
-  class IncompleteTestRunError < StandardError
-    def initialize(count)
-      super "#{count} tests were not run because the DeepTest Agents died"
+  # Fork in a separate thread.  If we fork from a DRb thread
+  #  (a thread handling a method call invoked over drb),
+  #  DRb still thinks the current object is the DRb Front Object,
+  #  and reports its uri as the same as in the parent process, even
+  #  if you restart DRb service.
+  #
+  def self.drb_safe_fork(&block)
+    Thread.new {Process.fork(&block)}.value
+  end
+
+  def self.init(options)
+    return if @initialized
+    @initialized = true
+    Metrics::Gatherer.setup(options)
+  end
+
+  class WorkUnitNeverReceivedError < StandardError
+    def initialize
+      super "DeepTest result never received.  Maybe an error was printed above?"
     end
 
     def backtrace
@@ -21,52 +33,53 @@ module DeepTest
 end
 
 require "logger"
+require "drb"
 require "timeout"
 require "thread"
 require "socket"
 require "webrick"
 require "timeout"
-require "base64"
 
-require File.dirname(__FILE__) + "/telegraph"
-require File.dirname(__FILE__) + "/deep_test/lib_root"
 require File.dirname(__FILE__) + "/deep_test/extensions/object_extension"
+require File.dirname(__FILE__) + "/deep_test/extensions/drb_extension"
 
-require File.dirname(__FILE__) + "/deep_test/demon"
 require File.dirname(__FILE__) + "/deep_test/deadlock_detector"
-require File.dirname(__FILE__) + "/deep_test/local_deployment"
+require File.dirname(__FILE__) + "/deep_test/local_workers"
 require File.dirname(__FILE__) + "/deep_test/logger"
 
 require File.dirname(__FILE__) + "/deep_test/marshallable_exception_wrapper"
-require File.dirname(__FILE__) + "/deep_test/null_listener"
+require File.dirname(__FILE__) + "/deep_test/null_worker_listener"
 require File.dirname(__FILE__) + "/deep_test/listener_list"
-require File.dirname(__FILE__) + "/deep_test/cpu_info"
-require File.dirname(__FILE__) + "/deep_test/failure_message"
+require File.dirname(__FILE__) + "/deep_test/option"
 require File.dirname(__FILE__) + "/deep_test/options"
-require File.dirname(__FILE__) + "/deep_test/main"
+require File.dirname(__FILE__) + "/deep_test/process_orchestrator"
 require File.dirname(__FILE__) + "/deep_test/result_reader"
 require File.dirname(__FILE__) + "/deep_test/rspec_detector"
-require File.dirname(__FILE__) + "/deep_test/central_command"
-require File.dirname(__FILE__) + "/deep_test/proxy_io"
+require File.dirname(__FILE__) + "/deep_test/server"
 require File.dirname(__FILE__) + "/deep_test/test_task"
-require File.dirname(__FILE__) + "/deep_test/agent"
+require File.dirname(__FILE__) + "/deep_test/worker"
 require File.dirname(__FILE__) + "/deep_test/warlock"
 
 require File.dirname(__FILE__) + "/deep_test/database/setup_listener"
 require File.dirname(__FILE__) + "/deep_test/database/mysql_setup_listener"
 
-require File.dirname(__FILE__) + "/deep_test/distributed/shell_environment"
-require File.dirname(__FILE__) + "/deep_test/distributed/landing_ship"
 require File.dirname(__FILE__) + "/deep_test/distributed/dispatch_controller"
-require File.dirname(__FILE__) + "/deep_test/distributed/ssh_client_connection_info"
+require File.dirname(__FILE__) + "/deep_test/distributed/drb_client_connection_info"
 require File.dirname(__FILE__) + "/deep_test/distributed/filename_resolver"
-require File.dirname(__FILE__) + "/deep_test/distributed/landing_fleet"
-require File.dirname(__FILE__) + "/deep_test/distributed/remote_deployment"
-require File.dirname(__FILE__) + "/deep_test/distributed/beachhead"
+require File.dirname(__FILE__) + "/deep_test/distributed/master_test_server"
+require File.dirname(__FILE__) + "/deep_test/distributed/test_server"
+require File.dirname(__FILE__) + "/deep_test/distributed/test_server_status"
+require File.dirname(__FILE__) + "/deep_test/distributed/test_server_workers"
+require File.dirname(__FILE__) + "/deep_test/distributed/multi_test_server_proxy"
+require File.dirname(__FILE__) + "/deep_test/distributed/null_work_unit"
+require File.dirname(__FILE__) + "/deep_test/distributed/remote_worker_client"
+require File.dirname(__FILE__) + "/deep_test/distributed/remote_worker_server"
 require File.dirname(__FILE__) + "/deep_test/distributed/rsync"
+require File.dirname(__FILE__) + "/deep_test/distributed/throughput_runner"
+require File.dirname(__FILE__) + "/deep_test/distributed/throughput_statistics"
+require File.dirname(__FILE__) + "/deep_test/distributed/throughput_worker_client"
 
-require File.dirname(__FILE__) + "/deep_test/metrics/data"
-require File.dirname(__FILE__) + "/deep_test/metrics/measurement"
+require File.dirname(__FILE__) + "/deep_test/metrics/gatherer"
 
 DeepTest::RSpecDetector.if_rspec_available do
   require File.dirname(__FILE__) + "/deep_test/spec"
@@ -75,4 +88,3 @@ require File.dirname(__FILE__) + "/deep_test/test"
 
 require File.dirname(__FILE__) + "/deep_test/ui/console"
 require File.dirname(__FILE__) + "/deep_test/ui/null"
-

data/lib/deep_test/database/mysql_setup_listener.rb

@@ -26,26 +26,26 @@ module DeepTest
       #
       def create_database
         admin_connection do |connection|
-          connection.create_database agent_database
+          connection.create_database worker_database
           grant_privileges connection
         end
       end
 
       #
-      # Grants 'all' privilege on agent database to username and password
-      # specified by agent database config.  If your application has
+      # Grants 'all' privilege on worker database to username and password
+      # specified by worker database config.  If your application has
       # special database privilege needs beyond 'all', you should override
       # this method and grant them.
       #
       def grant_privileges(connection)
-        puts "==== #{agent_database_config[:password].inspect}"
-        identified_by = if agent_database_config[:password]
-                          %{identified by %s} % connection.quote(agent_database_config[:password])
+        puts "==== #{worker_database_config[:password].inspect}"
+        identified_by = if worker_database_config[:password]
+                          %{identified by %s} % connection.quote(worker_database_config[:password])
                         else
                           ""
                         end
-        sql = %{grant all on #{agent_database}.* to %s@'localhost' #{identified_by} ; } % 
-          connection.quote(agent_database_config[:username])
+        sql = %{grant all on #{worker_database}.* to %s@'localhost' #{identified_by} ; } % 
+          connection.quote(worker_database_config[:username])
 
         connection.execute sql
       end
@@ -55,7 +55,7 @@ module DeepTest
       #
       def drop_database
         admin_connection do |connection|
-          connection.drop_database agent_database
+          connection.drop_database worker_database
         end
       end
 
@@ -69,10 +69,10 @@ module DeepTest
       end
 
       #
-      # Loads dumpfile into agent database using mysql command
+      # Loads dumpfile into worker database using mysql command
       #
       def load_schema
-        config = command_line_config(agent_database_config)
+        config = command_line_config(worker_database_config)
         system "mysql #{config} < #{dump_file_name}"
         raise "Error Loading schema" unless $?.success?
       end
@@ -87,7 +87,7 @@ module DeepTest
       end
 
       def system(command) # :nodoc:
-        DeepTest.logger.info { command }
+        DeepTest.logger.info command
         super command
       end
 

data/lib/deep_test/database/setup_listener.rb

@@ -2,18 +2,18 @@ module DeepTest
   module Database
     #
     # Skeleton Listener to help with setting up a separate database
-    # for each agent.  Calls +dump_schema+, +load_schema+, +create_database+,
+    # for each worker.  Calls +dump_schema+, +load_schema+, +create_database+,
     # and +drop_database+ hooks provided by subclasses that implement database
     # setup strategies for particular database flavors.
     #
-    class SetupListener < NullListener
+    class SetupListener < NullWorkerListener
       DUMPED_SCHEMAS = [] unless defined?(DUMPED_SCHEMAS)
 
       def before_sync # :nodoc:
         dump_schema_once
       end
 
-      def before_starting_agents # :nodoc:
+      def before_starting_workers # :nodoc:
         dump_schema_once
       end
 
@@ -23,11 +23,11 @@ module DeepTest
         DUMPED_SCHEMAS << schema_name
       end
 
-      def starting(agent) # :nodoc:
-        @agent = agent
+      def starting(worker) # :nodoc:
+        @worker = worker
 
         at_exit do
-          DeepTest.logger.debug { "dropping database #{agent_database}" }
+          DeepTest.logger.debug("dropping database #{worker_database}")
           drop_database
         end
 
@@ -38,26 +38,26 @@ module DeepTest
       end
 
       #
-      # Called on each agent after creating database and before loading
+      # Called on each worker after creating database and before loading
       # schema to initialize connections
       # 
       def connect_to_database
-        ActiveRecord::Base.establish_connection(agent_database_config)
+        ActiveRecord::Base.establish_connection(worker_database_config)
       end
 
       #
-      # Called in each agent to create the database named by 
-      # +agent_database+.
+      # Called in each worker to create the database named by 
+      # +worker_database+.
       #
       def create_database
         raise "Subclass must implement"
       end
 
       #
-      # Called in each agent to drop the database created by
+      # Called in each worker to drop the database created by
       # +create_database+.  This method is called twice, once before
       # +create_database+ to ensure that no database exists and once
-      # at exit to clean as the agent process exits.  This method
+      # at exit to clean as the worker process exits.  This method
       # must not fail if the database does not exist when it is called.
       #
       def drop_database
@@ -65,12 +65,12 @@ module DeepTest
       end
 
       #
-      # Called before any agents are spawned to dump the schema that
+      # Called before any workers are spawned to dump the schema that
       # will be used for testing.  When running distributed, this method
       # is called on the local machine providing the tests to run.
       #
       # For distributed testing to work, the schema must be dumped in
-      # location accessible by all agent machines.  The easiest way to
+      # location accessible by all worker machines.  The easiest way to
       # accomplish this is to dump it to a location within the working copy.
       #
       def dump_schema
@@ -79,21 +79,21 @@ module DeepTest
 
 
       #
-      # Called once in each agent as it is starting to load the schema
+      # Called once in each worker as it is starting to load the schema
       # dumped from dump_schema.  Subclasses should load the schema definition
-      # into the +agent_database+
+      # into the +worker_database+
       #
       def load_schema
         raise "Subclass must implement"
       end
 
       #
-      # ActiveRecord configuration for the agent database.  By default,
+      # ActiveRecord configuration for the worker database.  By default,
       # the same as +master_database_config+, except that points to
-      # +agent_database+ instead of the database named in the master config.
+      # +worker_database+ instead of the database named in the master config.
       # 
-      def agent_database_config
-        master_database_config.merge(:database => agent_database)
+      def worker_database_config
+        master_database_config.merge(:database => worker_database)
       end
 
       #
@@ -106,10 +106,10 @@ module DeepTest
       end
 
       #
-      # Unique name for database on machine that agent is running on.
+      # Unique name for database on machine that worker is running on.
       #
-      def agent_database
-        "deep_test_agent_#{@agent.number}_pid_#{Process.pid}" 
+      def worker_database
+        "deep_test_worker_#{@worker.number}_pid_#{Process.pid}" 
       end
     end
   end

data/lib/deep_test/distributed/dispatch_controller.rb

@@ -17,12 +17,9 @@ module DeepTest
 
         threads = @receivers.map do |r|
           Thread.new do
-            begin
-              Thread.current[:receiver] = r
+            Thread.current[:receiver] = r
+            Timeout.timeout(@options.timeout_in_seconds) do
               r.send method_name, *args
-            rescue Exception => e
-              Thread.current[:original_exception] = e
-              raise
             end
           end
         end
@@ -33,14 +30,15 @@ module DeepTest
             results << t.value
           rescue Timeout::Error
             @receivers.delete t[:receiver]
-            DeepTest.logger.error { "Timeout dispatching #{method_name} to #{description t[:receiver]}" }
-          rescue Exception => this_exception
+            DeepTest.logger.error "Timeout dispatching #{method_name} to #{t[:receiver].__drburi}"
+          rescue DRb::DRbConnError
             @receivers.delete t[:receiver]
-            DeepTest.logger.error { "Exception while dispatching #{method_name} to #{description t[:receiver]}:" }
-
-            e = t[:original_exception] || this_exception 
-            DeepTest.logger.error { "#{e.class}: #{e.message}" }
-            e.backtrace.each {|l| DeepTest.logger.error { l } }
+            unless options[:ignore_connection_error]
+              DeepTest.logger.error "Connection Refused dispatching #{method_name} to #{t[:receiver].__drburi}"
+            end
+          rescue Exception => e
+            @receivers.delete t[:receiver]
+            DeepTest.logger.error "Exception while dispatching #{method_name} to #{t[:receiver].__drburi} #{e.message}"
           end
         end
 
@@ -48,11 +46,6 @@ module DeepTest
       ensure
         @options.ui_instance.dispatch_finished(method_name)
       end
-
-      def description(receiver)
-        receiver.inspect
-      end
-
     end
 
     class NoDispatchReceiversError < StandardError; end

data/lib/deep_test/distributed/drb_client_connection_info.rb

@@ -0,0 +1,15 @@
+module DeepTest
+  module Distributed
+    class DRbClientConnectionInfo
+      attr_reader :address
+
+      def initialize
+        info = Thread.current['DRb']
+        raise "No DRb client found" unless info && info['client']
+        peeraddr = info['client'].peeraddr
+        DeepTest.logger.debug("DRbClientConnection info: #{peeraddr.inspect}")
+        @address = peeraddr[3]
+      end
+    end
+  end
+end

data/lib/deep_test/distributed/master_test_server.rb

@@ -0,0 +1,52 @@
+module DeepTest
+  module Distributed
+    class MasterTestServer
+      include ERB::Util
+
+      STATUS_PORT = 4020 unless defined?(STATUS_PORT)
+
+      attr_reader :servers
+
+      def initialize(servers)
+        @servers = servers
+      end
+
+      def show_status(req, res)
+        template = File.read(File.dirname(__FILE__) + "/show_status.rhtml")
+        res.body = ERB.new(template).result(binding)
+      end
+
+      def test_server_statuses
+        @servers.map do |s|
+          status = begin
+                     s.status
+                   rescue Exception => e
+                     e
+                   end
+
+          [s.__drburi, status]
+        end
+      end
+
+      def self.start(uri, server_uris)
+        master = start_drb(uri, server_uris)
+        start_http(master)
+        DeepTest.logger.info "MasterTestServer listening at #{DRb.uri}"
+        DRb.thread.join
+      end
+
+      def self.start_drb(uri, server_uris)
+        servers = server_uris.map {|server_uri| DRbObject.new_with_uri server_uri}
+        master = DeepTest::Distributed::MasterTestServer.new(servers)
+        DRb.start_service(uri, master)
+        master
+      end
+
+      def self.start_http(master)
+        s = WEBrick::HTTPServer.new :Port => STATUS_PORT
+        s.mount_proc("/", &master.method(:show_status))
+        Thread.new {s.start}
+      end
+    end
+  end
+end

data/lib/deep_test/distributed/multi_test_server_proxy.rb

@@ -0,0 +1,44 @@
+module DeepTest
+  module Distributed
+    class MultiTestServerProxy
+      def initialize(options, slaves)
+        DeepTest.logger.debug "MultiTestServerProxy#initialize #{slaves.length} slaves"
+        @slave_controller = DispatchController.new(options, slaves)
+      end
+
+      def spawn_worker_server(options)
+        DeepTest.logger.debug "dispatch spawn_worker_server for #{options.origin_hostname}"
+        WorkerServerProxy.new options,
+                              @slave_controller.dispatch(:spawn_worker_server, 
+                                                         options)
+      end
+
+      def sync(options)
+        DeepTest.logger.debug "dispatch sync for #{options.origin_hostname}"
+        @slave_controller.dispatch(:sync, options)
+      end
+
+      class WorkerServerProxy
+        def initialize(options, slaves)
+          DeepTest.logger.debug "WorkerServerProxy#initialize #{slaves.inspect}"
+          @slave_controller = DispatchController.new(options, slaves)
+        end
+
+        def load_files(files)
+          DeepTest.logger.debug "dispatch load_files"
+          @slave_controller.dispatch(:load_files, files)
+        end
+
+        def start_all
+          DeepTest.logger.debug "dispatch start_all"
+          @slave_controller.dispatch(:start_all)
+        end
+
+        def stop_all
+          DeepTest.logger.debug "dispatch stop_all"
+          @slave_controller.dispatch_with_options(:stop_all, :ignore_connection_error => true)
+        end
+      end
+    end
+  end
+end