From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Jul 2017 17:10:08 +0000 (+0000)
Subject: Merged r16926.
X-Git-Tag: 3.4.3~19
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f3e420c80293fc98aeebc8b9c86ae1385903c616;p=redmine.git

Merged r16926.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16927 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/unit/issue_nested_set_concurrency_test.rb b/test/unit/issue_nested_set_concurrency_test.rb
index b5f16db55..de5a1483b 100644
--- a/test/unit/issue_nested_set_concurrency_test.rb
+++ b/test/unit/issue_nested_set_concurrency_test.rb
@@ -27,7 +27,7 @@ class IssueNestedSetConcurrencyTest < ActiveSupport::TestCase
   self.use_transactional_fixtures = false
 
   def setup
-    skip if sqlite?
+    skip if sqlite? || mysql?
     CustomField.delete_all
   end
 
@@ -36,8 +36,6 @@ class IssueNestedSetConcurrencyTest < ActiveSupport::TestCase
   end
 
   def test_concurrency
-    skip if mysql?
-
     # Generates an issue and destroys it in order
     # to load all needed classes before starting threads
     i = Issue.generate!