[ARVADOS] updated: 52ecfbd9838f9f643de1e0bd579aaa3576db565d
git at public.curoverse.com
git at public.curoverse.com
Wed Sep 10 22:27:29 EDT 2014
Summary of changes:
apps/workbench/config/application.default.yml | 6 +++---
apps/workbench/test/diagnostics/pipeline_test.rb | 22 ++++++++++++++++++++--
sdk/python/arvados/collection.py | 3 +++
3 files changed, 26 insertions(+), 5 deletions(-)
via 52ecfbd9838f9f643de1e0bd579aaa3576db565d (commit)
via 9c861f63deb10765e98dba5746aac600bd1a5096 (commit)
via 741bf44b15569a3a4b1a4705b62e4f50c8365bc9 (commit)
from b4e495d7ee3ca9f9c816dd639dd2b57d85f6a5cf (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 52ecfbd9838f9f643de1e0bd579aaa3576db565d
Merge: 9c861f6 741bf44
Author: radhika <radhika at curoverse.com>
Date: Wed Sep 10 22:27:19 2014 -0400
Merge branch 'master' into 2761-diagnostic-suite
commit 9c861f63deb10765e98dba5746aac600bd1a5096
Author: radhika <radhika at curoverse.com>
Date: Wed Sep 10 22:26:28 2014 -0400
2761: file path needs lookup in prevew panel
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 6199aea..b2963af 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -161,13 +161,13 @@ common:
#diagnostics_testing_user_tokens:
# active: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
#diagnostics_testing_pipeline_fields:
- # pipeline with one input:
+ # pipeline with collection input:
# template_uuid: 4xphq-p5p6p-gsw68qb7owx1q2h
# input_paths: [qr1hi-4zz18-n1o4i1j5fvz6npu]
# max_wait_seconds: 100
- # pipeline with two inputs:
+ # pipeline with file as input:
# template_uuid: 4xphq-p5p6p-gsw68qb7owx1q2h
- # input_paths: [2051b5d448fbd489ab00bbdedbee1ffa+91, e5e440c9c486df057e1bf6a7feac25be+77/alignment_summary_metrics.txt]
+ # input_paths: [440e201c0141cb8a551b61fd7d07d2a1+83/qr1hi-8i9sb-j2tp8q1m2uf6a1o.log.txt]
# max_wait_seconds: 200
# pipeline with no inputs:
# template_uuid: 4xphq-p5p6p-gsw68qb7owx1q2h
diff --git a/apps/workbench/test/diagnostics/pipeline_test.rb b/apps/workbench/test/diagnostics/pipeline_test.rb
index 6101791..d6dc607 100644
--- a/apps/workbench/test/diagnostics/pipeline_test.rb
+++ b/apps/workbench/test/diagnostics/pipeline_test.rb
@@ -44,10 +44,28 @@ class PipelineTest < DiagnosticsTest
inputs_needed[0].click
within('.modal-dialog') do
+ look_for_uuid = nil
+ look_for_file = nil
look_for = pipeline_config['input_paths'][index]
- fill_in('Search', with: look_for, exact: true)
+ if look_for.index('/').andand.>0
+ partitions = look_for.partition('/')
+ look_for_uuid = partitions[0]
+ look_for_file = partitions[2]
+ else
+ look_for_uuid = look_for
+ look_for_file = nil
+ end
+
+ fill_in('Search', with: look_for_uuid, exact: true)
wait_for_ajax
- find('.selectable').click
+ selectables = page.all('.selectable')
+ selectables[0].click
+ if look_for_file
+ wait_for_ajax
+ within('.collection_files_name', text: look_for_file) do
+ find('.fa-file').click
+ end
+ end
find('button', text: 'OK').click
wait_for_ajax
index += 1
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list