[ARVADOS] updated: 1.3.0-2757-gbd5122689

Git user git at public.arvados.org
Mon Jul 20 21:41:41 UTC 2020


Summary of changes:
 services/api/Gemfile               | 2 +-
 services/api/Gemfile.lock          | 4 +---
 services/api/test/unit/log_test.rb | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

       via  bd51226895e036486f209ee785e57e2e50dfd5eb (commit)
      from  36644eb5315cdc6579dbd11aa595e3c9fa14e278 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bd51226895e036486f209ee785e57e2e50dfd5eb
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Mon Jul 20 18:29:47 2020 -0300

    16470: Disables transactional tests on log unit tests to avoid failures.
    
    Rails 5.1+ makes tests to share a DB connection when new threads are created.
    In order to avoid test failures and sometimes deadlock, I disabled the
    transactional tests for this group.
    
    See: https://github.com/rails/rails/issues/28466
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/services/api/Gemfile b/services/api/Gemfile
index fddb64a28..81f27cfd1 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -9,7 +9,7 @@ gem 'responders', '~> 2.0'
 
 group :test, :development do
   gem 'factory_bot_rails'
-  gem 'database_cleaner'
+  #gem 'database_cleaner'
 
   # As of now (2019-03-27) There's an open issue about incompatibilities with
   # newer versions of this gem: https://github.com/rails/rails-perftest/issues/38
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index a2b787e37..90306bb58 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -92,7 +92,6 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
-    database_cleaner (1.7.0)
     erubi (1.9.0)
     execjs (2.7.0)
     extlib (0.9.16)
@@ -283,7 +282,6 @@ DEPENDENCIES
   andand
   arvados!
   byebug
-  database_cleaner
   factory_bot_rails
   httpclient
   jquery-rails
@@ -317,4 +315,4 @@ DEPENDENCIES
   uglifier (~> 2.0)
 
 BUNDLED WITH
-   1.16.6
+   1.17.3
diff --git a/services/api/test/unit/log_test.rb b/services/api/test/unit/log_test.rb
index a1c8ff8a9..534944da1 100644
--- a/services/api/test/unit/log_test.rb
+++ b/services/api/test/unit/log_test.rb
@@ -7,6 +7,7 @@ require 'audit_logs'
 
 class LogTest < ActiveSupport::TestCase
   include CurrentApiClient
+  self.use_transactional_tests = false
 
   EVENT_TEST_METHODS = {
     :create => [:created_at, :assert_nil, :assert_not_nil],

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list