[ARVADOS] created: 0ed39efc7ccbb6d03cf9f406a3a0a060bcc50d3c

[Git user]

        at  0ed39efc7ccbb6d03cf9f406a3a0a060bcc50d3c (commit)


commit 0ed39efc7ccbb6d03cf9f406a3a0a060bcc50d3c
Author: radhika <radhika at curoverse.com>
Date:   Tue Mar 14 22:58:43 2017 -0400

    11251: an intial stab at using minitest --exclude option to split workbench integration tests into multiple jobs.

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index eac4fdf..1c2cb0c 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -33,7 +33,7 @@ group :development do
 end
 
 group :test, :diagnostics, :performance do
-  gem 'minitest', '~> 5.0'
+  gem 'minitest', '~> 5.10'
   gem 'selenium-webdriver'
   gem 'capybara'
   gem 'poltergeist'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 0abe868..d9564e1 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -153,7 +153,7 @@ GEM
     metaclass (0.0.4)
     mime-types (2.99)
     mini_portile (0.6.2)
-    minitest (5.8.4)
+    minitest (5.10.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     morrisjs-rails (0.5.1)
@@ -292,7 +292,7 @@ DEPENDENCIES
   less-rails
   lograge
   logstash-event
-  minitest (~> 5.0)
+  minitest (~> 5.10)
   mocha
   morrisjs-rails
   multi_json
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 44f9a30..811d84d 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -64,6 +64,8 @@ apps/workbench (*)
 apps/workbench_units (*)
 apps/workbench_functionals (*)
 apps/workbench_integration (*)
+apps/workbench_integration_all_but_ps (*)
+apps/workbench_integration_only_ps (*)
 apps/workbench_benchmark
 apps/workbench_profile
 doc
@@ -102,8 +104,10 @@ tools/keep-exercise
 tools/keep-rsync
 tools/keep-block-check
 
-(*) apps/workbench is shorthand for apps/workbench_units +
-    apps/workbench_functionals + apps/workbench_integration
+(*) apps/workbench is shorthand for
+    apps/workbench_units +
+    apps/workbench_functionals +
+    apps/workbench_integration_all_but_ps + apps/workbench_integration_only_ps
 
 EOF
 
@@ -519,7 +523,7 @@ retry() {
 
 do_test() {
     case "${1}" in
-        apps/workbench_units | apps/workbench_functionals | apps/workbench_integration)
+        apps/workbench_units | apps/workbench_functionals | apps/workbench_integration_all_but_ps | apps/workbench_integration_only_ps)
             suite=apps/workbench
             ;;
         *)
@@ -885,6 +889,19 @@ test_workbench_integration() {
 }
 do_test apps/workbench_integration workbench_integration
 
+test_workbench_integration_all_but_ps() {
+    start_nginx_proxy_services \
+        && cd "$WORKSPACE/apps/workbench" \
+        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:integration TESTOPTS=-e/^\(test_pipeline\|test_project\)\.*$/
+}
+do_test apps/workbench_integration_all_but_ps workbench_integration_all_but_ps
+
+test_workbench_integration_only_ps() {
+    start_nginx_proxy_services \
+        && cd "$WORKSPACE/apps/workbench" \
+        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:integration TESTOPTS=-v TEST=test/integration/p*.rb
+}
+do_test apps/workbench_integration_only_ps workbench_integration_only_ps
 
 test_workbench_benchmark() {
     start_nginx_proxy_services \

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


hooks/post-receive
--