Merge pull request #2032 from rspec/2029-followups

2029 followups

Author: JonRowe

Changelog.md

@@ -17,6 +17,12 @@ Enhancements:
   the number of runs necessary to determine that an example set cannot be
   minimized further. (Simon Coffey, #1997)
 
+Bug Fixes:
+
+* Lock `example_status_persistence_file` when reading from and writing
+  to it to prevent race conditions when multiple processes try to use
+  it. (Ben Woosley, #2029)
+
 ### 3.3.2 / 2015-07-15
 [Full Changelog](http://github.com/rspec/rspec-core/compare/v3.3.1...v3.3.2)
 

lib/rspec/core/example_status_persister.rb

@@ -27,24 +27,22 @@ def persist
           # condition where parallel or unrelated spec runs race to
           # update the same file
           f.flock(File::LOCK_EX)
-          @previous_runs = f.read
+          unparsed_previous_runs = f.read
           f.rewind
-          f.write(dumped_statuses)
+          f.write(dump_statuses(unparsed_previous_runs))
           f.flush
           f.truncate(f.pos)
         end
       end
 
     private
 
-      def dumped_statuses
+      def dump_statuses(unparsed_previous_runs)
+        statuses_from_previous_runs = ExampleStatusParser.parse(unparsed_previous_runs)
+        merged_statuses = ExampleStatusMerger.merge(statuses_from_this_run, statuses_from_previous_runs)
         ExampleStatusDumper.dump(merged_statuses)
       end
 
-      def merged_statuses
-        ExampleStatusMerger.merge(statuses_from_this_run, statuses_from_previous_runs)
-      end
-
       def statuses_from_this_run
         @examples.map do |ex|
           result = ex.execution_result
@@ -56,10 +54,6 @@ def statuses_from_this_run
           }
         end
       end
-
-      def statuses_from_previous_runs
-        ExampleStatusParser.parse(@previous_runs)
-      end
     end
 
     # Merges together a list of example statuses from this run

spec/rspec/core/configuration_spec.rb

@@ -164,15 +164,14 @@ def absolute_path_to(dir)
 
     shared_examples "a configurable framework adapter" do |m|
       it "yields a config object if the framework_module supports it" do
-        custom_config = Struct.new(:custom_setting).new
         mod = Module.new
-        allow(mod).to receive_messages(:configuration => custom_config)
+        def mod.configuration; @config ||= Struct.new(:custom_setting).new; end
 
         config.send m, mod do |mod_config|
           mod_config.custom_setting = true
         end
 
-        expect(custom_config.custom_setting).to be_truthy
+        expect(mod.configuration.custom_setting).to be_truthy
       end
 
       it "raises if framework module doesn't support configuration" do
@@ -236,8 +235,7 @@ def absolute_path_to(dir)
 
         it 'raises an error since this setting must be applied before any groups are defined' do
           allow(RSpec.world).to receive(:example_groups).and_return([double.as_null_object])
-          mocha = stub_const("RSpec::Core::MockingAdapters::Mocha", Module.new)
-          allow(mocha).to receive_messages(:framework_name => :mocha)
+          class_double("RSpec::Core::MockingAdapters::Mocha", :framework_name => :mocha).as_stubbed_const
 
           expect {
             config.mock_with :mocha
@@ -251,8 +249,7 @@ def absolute_path_to(dir)
         end
 
         it 'does not raise an error if re-setting the same config' do
-          mocha = stub_const("RSpec::Core::MockingAdapters::Mocha", Module.new)
-          allow(mocha).to receive_messages(:framework_name => :mocha)
+          class_double("RSpec::Core::MockingAdapters::Mocha", :framework_name => :mocha).as_stubbed_const
 
           groups = []
           allow(RSpec.world).to receive_messages(:example_groups => groups)

spec/rspec/core/example_group_spec.rb

@@ -494,7 +494,6 @@ def ascending_numbers
       context "with no filters" do
         it "returns all" do
           group = RSpec.describe
-          allow(group).to receive(:world) { self.world }
           example = group.example("does something")
           expect(group.filtered_examples).to eq([example])
         end
@@ -506,7 +505,6 @@ def ascending_numbers
           filter_manager.include :awesome => false
           allow(self.world).to receive_messages(:filter_manager => filter_manager)
           group = RSpec.describe
-          allow(group).to receive(:world) { self.world }
           group.example("does something")
           expect(group.filtered_examples).to eq([])
         end

spec/rspec/core/example_status_persister_spec.rb

@@ -73,7 +73,7 @@ def new_example(id, metadata = {})
 
         # dumped_statuses is called after the file is locked but
         # before the output is written
-        allow(persister_1).to receive(:dumped_statuses).and_wrap_original do |m, *args|
+        allow(persister_1).to receive(:dump_statuses).and_wrap_original do |m, *args|
           persister_2_thread = Thread.new { persister_2.persist }
           m.call(*args)
         end

spec/rspec/core/formatters/documentation_formatter_spec.rb

@@ -6,7 +6,6 @@ module RSpec::Core::Formatters
 
     before do
       send_notification :start, start_notification(2)
-      allow(formatter).to receive(:color_enabled?).and_return(false)
     end
 
     def execution_result(values)

spec/rspec/core/formatters/progress_formatter_spec.rb

@@ -5,7 +5,6 @@
 
   before do
     send_notification :start, start_notification(2)
-    allow(formatter).to receive(:color_enabled?).and_return(false)
   end
 
   it 'prints a . on example_passed' do

spec/rspec/core/memoized_helpers_spec.rb

@@ -113,18 +113,14 @@ def working_with?(double)
       [false, nil].each do |falsy_value|
         context "with a value of #{falsy_value.inspect}" do
           it "is evaluated once per example" do
-            example_group = RSpec.describe(Array)
-            example_group.before do
-              expect(Object).to receive(:this_question?).once.and_return(falsy_value)
-            end
-            example_group.subject do
-              Object.this_question?
-            end
-            example_group.example do
-              subject
-              subject
+            subject_calls = 0
+
+            describe_successfully do
+              subject { subject_calls += 1; falsy_value }
+              example { subject; subject }
             end
-            expect(example_group.run).to be_truthy, "expected subject block to be evaluated only once"
+
+            expect(subject_calls).to eq(1)
           end
         end
       end

spec/spec_helper.rb

@@ -95,6 +95,10 @@ def handle_current_dir_change
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
+  c.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
   c.around(:example, :simulate_shell_allowing_unquoted_ids) do |ex|
     with_env_vars('SHELL' => '/usr/local/bin/bash', &ex)
   end