[ARVADOS] updated: a6f8d9e254b27305f8f61adc04b685206531237e

git at public.curoverse.com git at public.curoverse.com
Tue Sep 16 17:27:45 EDT 2014


Summary of changes:
 .../workbench/test/integration/collections_test.rb |  12 ++
 .../test/integration/pipeline_instances_test.rb    |   9 +-
 docker/java-bwa-samtools/Dockerfile                |   5 +-
 sdk/python/arvados/collection.py                   |  10 +-
 sdk/python/arvados/keep.py                         | 130 +++++++++++----------
 services/api/Gemfile                               |   4 +-
 services/api/Gemfile.lock                          |   8 +-
 services/api/script/crunch-dispatch.rb             |  60 +++++-----
 services/api/test/fixtures/pipeline_instances.yml  |   8 --
 services/fuse/arvados_fuse/__init__.py             |  18 ++-
 10 files changed, 145 insertions(+), 119 deletions(-)

       via  a6f8d9e254b27305f8f61adc04b685206531237e (commit)
       via  91fe76f4a3f8e5f59d12343ae69d2ba5a43d8e55 (commit)
       via  19ba184b0a37d93b5ef5679be8bcc72417887d62 (commit)
       via  46ad2015c1db3662a1ece565df06acbbfd7ee7ec (commit)
       via  facb6375180b37b628c417e97a181abe71e3181c (commit)
       via  46f5403fdd2b3b0bd26d81d81ba509c624f54bb3 (commit)
       via  4dedb0cc8921e7210ed245107b83996eb0d4e974 (commit)
       via  1065f68b84a650980cbcc1e0dd51b587d075f06b (commit)
       via  bf243e064a7a2ee4e69a87dc3ba46e949a545150 (commit)
       via  9a88a95c52bf3b1da8152ab382de5b78be8568eb (commit)
      from  642670d6614fe30f3ad4248f8415a290c6c3ad45 (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 a6f8d9e254b27305f8f61adc04b685206531237e
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 16 17:26:13 2014 -0400

    2875: remove pipeline instance fixture and use an existing one.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 370007e..b996068 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -162,13 +162,13 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     visit page_with_token('active_trustedclient')
 
     visit '/pipeline_instances'
-    assert page.has_text? 'pipeline_with_template'
+    assert page.has_text? 'pipeline_with_job'
 
     find('a', text: 'pipeline_with_job').click
 
     within('.arv-description-as-subtitle') do
       find('.fa-pencil').click
-      find('.editable-input textarea').set('*Textile description for pipeline instance* - "link to template":' + api_fixture('pipeline_templates')['two_part']['uuid'])
+      find('.editable-input textarea').set('*Textile description for pipeline instance*')
       find('.editable-submit').click
     end
     wait_for_ajax
@@ -176,11 +176,6 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     # verify description
     assert page.has_no_text? '*Textile description for pipeline instance*'
     assert page.has_text? 'Textile description for pipeline instance'
-    assert page.has_link? 'link to template'
-    click_link 'link to template'
-
-    # in template page
-    assert page.has_text? 'Two Part Pipeline Template'
   end
 
   test "JSON popup available for strange components" do
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index d4172b7..7bfc2e1 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -62,11 +62,3 @@ components_is_jobspec:
         dataclass: Collection
         title: "Foo/bar pair"
         description: "Provide a collection containing at least two files."
-
-pipeline_with_template:
-  state: New
-  uuid: zzzzz-d1hrv-1234eyn6br1abcd
-  name: pipeline_with_template
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  created_at: <%= 1.minute.ago.to_s(:db) %>
-  pipeline_template_uuid: zzzzz-p5p6p-aox0k0ofxrystgw

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list