Merge pull request #4 from conversation/self-testable

Make rspec-queue self testable
conversation · May 24, 2019 · 8e34047 · 8e34047
2 parents bf1cee3 + 6d86b0e
commit 8e34047
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/rspec_queue/server.rb b/lib/rspec_queue/server.rb
@@ -1,3 +1,6 @@
+require 'socket'
+require 'securerandom'
+
 module RSpecQueue
   class Server
 

diff --git a/lib/rspec_queue/server_runner.rb b/lib/rspec_queue/server_runner.rb
@@ -6,13 +6,14 @@
 module RSpecQueue
   class ServerRunner < RSpec::Core::Runner
     def run_specs(example_groups)
+      worker_pids = []
+
       example_group_hash = example_groups.map { |example_group|
         [example_group.id, example_group]
       }.to_h
 
       # start the server, so we are ready to accept connections from workers
       server = RSpecQueue::Server.new
-      worker_pids = []
 
       RSpecQueue::Configuration.instance.worker_count.times do |i|
         env = {
@@ -38,7 +39,7 @@ def run_specs(example_groups)
         end
       end
     ensure
-      server.close
+      server.close if server
 
       worker_pids.each do |pid|
         Process.kill("TERM", pid)

diff --git a/lib/rspec_queue/worker.rb b/lib/rspec_queue/worker.rb
@@ -1,4 +1,5 @@
 require 'json'
+require 'socket'
 
 module RSpecQueue
   class Worker