Merge pull request #2261 from broadinstitute/jb-test-stability-fix

Updating tests for stability

Author: bistline

bin/run_orch_smoke_test.sh

@@ -18,6 +18,8 @@ DOCKER_IMAGE_NAME="gcr.io/broad-singlecellportal-staging/single-cell-portal"
 DOCKER_IMAGE_VERSION="development"
 PASSENGER_APP_ENV="test"
 NON_DOCKERIZED="false"
+# disable warnings about frozen literals
+export RUBYOPT=--disable-frozen-string-literal
 
 while getopts "k:e:v:d" OPTION; do
 case $OPTION in

test/integration/external/study_validation_test.rb

@@ -130,8 +130,6 @@ class StudyValidationTest < ActionDispatch::IntegrationTest
     end
     puts "After #{seconds_slept} seconds, " + (example_files.values.map { |e| "#{e[:name]} is #{e[:object].parse_status}"}).join(", ") + '.'
 
-    study.reload
-
     example_files.values.each do |e|
       e[:object].reload # address potential race condition between parse_status setting to 'failed' and DeleteQueueJob executing
       assert_equal 'failed', e[:object].parse_status, "Incorrect parse_status for #{e[:name]}"
@@ -140,6 +138,8 @@ class StudyValidationTest < ActionDispatch::IntegrationTest
       assert cached_file.present?, "Did not find cached file at #{e[:cache_location]} in #{study.bucket_id}"
     end
 
+    sleep(5)
+    study.reload
     assert_equal 0, study.cell_metadata.size
     assert_equal 0, study.genes.size
     assert_equal 0, study.cluster_groups.size

test/lib/summary_stats_utils_test.rb

@@ -157,18 +157,21 @@ class SummaryStatsUtilsTest < ActiveSupport::TestCase
   end
 
   test 'should get data retention policy report' do
+    expected_studies = Study.where(detached: false, firecloud_project: FireCloudClient::PORTAL_NAMESPACE)
     client_mock = Minitest::Mock.new
     bucket_mock = Minitest::Mock.new
-    created_at = DateTime.now.in_time_zone - 1.day
-    bucket_mock.expect :nil?, false
     file_mock = Minitest::Mock.new
-    2.times do
-      bucket_mock.expect :next?, false
-      file_mock.expect :next?, false
+    created_at = DateTime.now.in_time_zone - 1.day
+    expected_studies.each do |study|
+      bucket_mock.expect :nil?, false
+      2.times do
+        bucket_mock.expect :next?, false
+        file_mock.expect :next?, false
+      end
+      file_mock.expect :any?, true
+      bucket_mock.expect :files, file_mock
+      client_mock.expect :get_workspace_bucket, bucket_mock, [study.bucket_id]
     end
-    file_mock.expect :any?, true
-    bucket_mock.expect :files, file_mock
-    client_mock.expect :get_workspace_bucket, bucket_mock, [String]
     FireCloudClient.stub :new, client_mock do
       SummaryStatsUtils.stub :bytes_and_last_created_for,
                              [250.gigabytes, created_at],