[ARVADOS] updated: 37cd41354dd5acccd2c0405fbe0c4a8d29a79670
git at public.curoverse.com
git at public.curoverse.com
Tue Sep 9 13:24:31 EDT 2014
Summary of changes:
apps/workbench/config/diagnostics.yml | 14 +++
apps/workbench/config/diagnostics.yml.example | 14 +++
apps/workbench/config/load_config.rb | 2 +-
apps/workbench/test/diagnostics/pipeline_test.rb | 55 +++++++++
apps/workbench/test/test_helper.rb | 7 +-
sdk/python/arvados/commands/keepdocker.py | 149 +++++++++++++++++++----
sdk/python/arvados/commands/put.py | 143 ++++++++++------------
sdk/python/tests/test_arv_put.py | 99 ++++-----------
8 files changed, 303 insertions(+), 180 deletions(-)
create mode 100644 apps/workbench/config/diagnostics.yml
create mode 100644 apps/workbench/config/diagnostics.yml.example
create mode 100644 apps/workbench/test/diagnostics/pipeline_test.rb
via 37cd41354dd5acccd2c0405fbe0c4a8d29a79670 (commit)
via 1eedd481146bc30cd2548c44399949cbfa2d576b (commit)
via f467b469109e27bc18635c8952892e4c23fabd60 (commit)
via 83bcea2d5b07cfba63d3252a98d4ad75528e18f4 (commit)
via 8eeb2671b0a9815345218da335731a31230ada13 (commit)
via b6017f4edc19188fa26f74ff0da2bedb94841dcf (commit)
via 9e9506f9acce0d11a82f7abcea31680761d6427b (commit)
via c6537733d0bd44f0319dec074492e7e943549145 (commit)
via c8de202a8ba2b7e128f9698c4b57f0d7d9e89c1d (commit)
via d770a5119378b5c133b19d7c44881c3db313e448 (commit)
from d97be42e8dd9a9495480b8c1e2a83db46b79cb5c (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 37cd41354dd5acccd2c0405fbe0c4a8d29a79670
Merge: 1eedd48 f467b46
Author: radhika <radhika at curoverse.com>
Date: Tue Sep 9 13:24:20 2014 -0400
Merge branch 'master' into 2761-diagnostic-suite
commit 1eedd481146bc30cd2548c44399949cbfa2d576b
Author: radhika <radhika at curoverse.com>
Date: Tue Sep 9 13:23:49 2014 -0400
2761: diagnostics testing
diff --git a/apps/workbench/config/diagnostics.yml b/apps/workbench/config/diagnostics.yml
new file mode 100644
index 0000000..b3f9b48
--- /dev/null
+++ b/apps/workbench/config/diagnostics.yml
@@ -0,0 +1,14 @@
+# Do not use this file for diagnostics testing configuration.
+# Instead, create diagnostics.yml by making a copy
+
+development:
+ diagnostics_testing_active_user_token: "eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r"
+ diagnostics_testing_admin_user_token: false
+
+production:
+ diagnostics_testing_active_user_token: false
+ diagnostics_testing_admin_user_token: false
+
+common:
+ diagnostics_testing_active_user_token: false
+ diagnostics_testing_admin_user_token: false
diff --git a/apps/workbench/config/diagnostics.yml.example b/apps/workbench/config/diagnostics.yml.example
new file mode 100644
index 0000000..4093e42
--- /dev/null
+++ b/apps/workbench/config/diagnostics.yml.example
@@ -0,0 +1,14 @@
+# Do not use this file for diagnostics testing configuration.
+# Instead, create diagnostics.yml by making a copy
+
+development:
+ diagnostics_testing_active_user_token: false
+ diagnostics_testing_admin_user_token: false
+
+production:
+ diagnostics_testing_active_user_token: false
+ diagnostics_testing_admin_user_token: false
+
+common:
+ diagnostics_testing_active_user_token: false
+ diagnostics_testing_admin_user_token: false
diff --git a/apps/workbench/config/load_config.rb b/apps/workbench/config/load_config.rb
index 51fc81a..f47c8a8 100644
--- a/apps/workbench/config/load_config.rb
+++ b/apps/workbench/config/load_config.rb
@@ -3,7 +3,7 @@
$application_config = {}
-%w(application.default application).each do |cfgfile|
+%w(application.default application diagnostics).each do |cfgfile|
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
if File.exists? path
yaml = ERB.new(IO.read path).result(binding)
diff --git a/apps/workbench/test/diagnostics/pipeline_test.rb b/apps/workbench/test/diagnostics/pipeline_test.rb
new file mode 100644
index 0000000..431719e
--- /dev/null
+++ b/apps/workbench/test/diagnostics/pipeline_test.rb
@@ -0,0 +1,55 @@
+require 'integration_helper'
+require 'selenium-webdriver'
+require 'headless'
+
+class PipelineTest < ActionDispatch::IntegrationTest
+ setup do
+ headless = Headless.new
+ headless.start
+ Capybara.current_driver = :selenium
+ end
+
+ test 'Run tutorial pipeline' do
+ visit page_with_token(Rails.configuration.diagnostics_testing_active_user_token)
+
+ # Search for tutorial template
+ within('.navbar-fixed-top') do
+ page.find_field('search').set 'Diagnostic testing - Tutorial pipeline template'
+ page.find('.glyphicon-search').click
+ end
+
+ within '.modal-content' do
+ find('.selectable', text: 'Diagnostic testing - Tutorial pipeline template').click
+ click_button 'Show'
+ end
+
+ # Tun the pipeline
+ find('a,button', text: 'Run').click
+
+ # Choose project
+ within('.modal-dialog') do
+ find('.selectable', text: 'Home').click
+ find('button', text: 'Choose').click
+ end
+
+ # This pipeline needs input. So, Run should be disabled
+ page.assert_selector 'a.disabled,button.disabled', text: 'Run'
+
+ instance_page = current_path
+
+ # Choose input for the pipeline
+ find('.btn', text: 'Choose').click
+ within('.modal-dialog') do
+ find('.selectable', text: 'Diagnostic testing - Tutorial pipeline input').click
+ find('button', text: 'OK').click
+ end
+ wait_for_ajax
+
+ # Run this pipeline instance
+ find('a,button', text: 'Run').click
+
+ # Pipeline is running. We have a "Stop" button instead now.
+ page.assert_selector 'a,button', text: 'Stop'
+ end
+
+end
diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 260bff0..7f23988 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -1,4 +1,5 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] = "test" if !ENV["RAILS_ENV"]
+
unless ENV["NO_COVERAGE_TEST"]
begin
require 'simplecov'
@@ -151,4 +152,6 @@ class ApiServerForTests
end
end
-ApiServerForTests.run
+if ENV["RAILS_ENV"].eql? 'test'
+ ApiServerForTests.run
+end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list