kill off parallelism for sqlite and test rails 5 with foreign keys

Author: mceachen

.travis.yml

@@ -11,6 +11,7 @@ rvm:
 gemfile:
   - gemfiles/activerecord_4.1.gemfile
   - gemfiles/activerecord_4.2.gemfile
+  - gemfiles/activerecord_5.0_foreigner.gemfile
   - gemfiles/activerecord_5.0.gemfile
   - gemfiles/activerecord_edge.gemfile
 

Appraisals

@@ -1,6 +1,6 @@
 appraise 'activerecord-4.1' do
   gem 'activerecord', '~> 4.1.0'
-  gem 'foreigner', :git => 'https://github.com/matthuhiggins/foreigner.git'
+  gem 'foreigner'
   platforms :ruby, :rbx do
     gem 'mysql2', '~> 0.3.20'
   end
@@ -14,6 +14,11 @@ appraise 'activerecord-4.2' do
   end
 end
 
+appraise 'activerecord-5.0-foreigner' do
+  gem 'activerecord', '~> 5.0.0'
+  gem 'foreigner'
+end
+
 appraise 'activerecord-5.0' do
   gem 'activerecord', '~> 5.0.0'
 end

README.md

@@ -527,7 +527,7 @@ bundle install
 
 ### Object destroy fails with MySQL 5.7+
 
-A bug was introduced in the query optimizer. [See the workaround here](https://github.com/mceachen/closure_tree/issues/206).
+A bug was introduced in MySQL's query optimizer. [See the workaround here](https://github.com/mceachen/closure_tree/issues/206).
 
 ## Testing with Closure Tree
 

gemfiles/activerecord_4.1.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1.0"
-gem "foreigner", :git => "https://github.com/matthuhiggins/foreigner.git"
+gem "foreigner"
 
 platforms :ruby, :rbx do
   gem "mysql2", "~> 0.3.20"

gemfiles/activerecord_5.0_foreigner.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+gem "foreigner"
+
+platforms :ruby, :rbx do
+  gem "mysql2"
+  gem "pg"
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcpostgresql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+gemspec :path => "../"

spec/parallel_spec.rb

@@ -1,17 +1,18 @@
 require 'spec_helper'
 
 # We don't need to run the expensive parallel tests for every combination of prefix/suffix.
-# Those affect SQL generation, not parallelism
+# Those affect SQL generation, not parallelism.
+# SQLite doesn't support concurrency reliably, either.
 def run_parallel_tests?
-  ActiveRecord::Base.table_name_prefix.empty? &&
+  !sqlite? &&
+    ActiveRecord::Base.table_name_prefix.empty? &&
     ActiveRecord::Base.table_name_suffix.empty?
 end
 
 def max_threads
   5
 end
 
-
 class WorkerBase
   extend Forwardable
   attr_reader :name
@@ -106,7 +107,7 @@ def run_workers(worker_class = FindOrCreateWorker)
     run_workers
     # duplication from at least one iteration:
     expect(Tag.where(name: @names).size).to be > @iterations
-  end unless sqlite? # sqlite throws errors from concurrent access
+  end
 
   class SiblingPrependerWorker < WorkerBase
     def before_work
@@ -119,50 +120,6 @@ def work
     end
   end
 
-  # TODO: this test should be rewritten to be proper producer-consumer code
-  xit 'fails to deadlock from parallel sibling churn' do
-    # target should be non-trivially long to maximize time spent in hierarchy maintenance
-    target = Tag.find_or_create_by_path(('a'..'z').to_a + ('A'..'Z').to_a)
-    expected_children = (1..100).to_a.map { |ea| "root ##{ea}" }
-    children_to_add = expected_children.dup
-    added_children = []
-    children_to_delete = []
-    deleted_children = []
-    creator_threads = @workers.times.map do
-      Thread.new do
-        while children_to_add.present?
-          name = children_to_add.shift
-          unless name.nil?
-            Tag.transaction { target.find_or_create_by_path(name) }
-            children_to_delete << name
-            added_children << name
-          end
-        end
-      end
-    end
-    run_destruction = true
-    destroyer_threads = @workers.times.map do
-      Thread.new do
-        begin
-          victim_name = children_to_delete.shift
-          if victim_name
-            Tag.transaction do
-              victim = target.children.where(name: victim_name).first
-              victim.destroy
-              deleted_children << victim_name
-            end
-          else
-            sleep rand # wait for more victims
-          end
-        end while run_destruction || !children_to_delete.empty?
-      end
-    end
-    creator_threads.each(&:join)
-    destroyer_threads.each(&:join)
-    expect(added_children).to match(expected_children)
-    expect(deleted_children).to match(expected_children)
-  end
-
   it 'fails to deadlock while simultaneously deleting items from the same hierarchy' do
     target = User.find_or_create_by_path((1..200).to_a.map { |ea| ea.to_s })
     emails = target.self_and_ancestors.to_a.map(&:email).shuffle
@@ -176,7 +133,7 @@ def work
     end
     User.connection.reconnect!
     expect(User.all).to be_empty
-  end unless sqlite? # sqlite throws errors from concurrent access
+  end
 
   class SiblingPrependerWorker < WorkerBase
     def before_work
@@ -198,6 +155,5 @@ def work
 
     # The only non-root node should be "root":
     expect(Label.all.select { |ea| ea.root? }).to eq([@target.parent])
-  end unless sqlite? # sqlite throws errors from concurrent access
-
+  end
 end if run_parallel_tests?

tests.sh

@@ -1,9 +1,10 @@
 #!/bin/sh -ex
 
-for RMI in 2.2.3 #jruby-1.6.13 :P
+for RMI in 2.3.1 #jruby-1.6.13 :P
 do
   rbenv local $RMI
-  for DB in postgresql mysql sqlite
+  appraisal bundle install
+  for DB in mysql sqlite postgresql
   do
     appraisal rake spec:all WITH_ADVISORY_LOCK_PREFIX=$(date +%s) DB=$DB
   done