[ARVADOS] updated: 39507a40922e11e6863e4dd788ad3231e6fb3224

[git at public.curoverse.com]

Summary of changes:
 .../pipeline_instances_controller_test.rb          |  5 ++--
 apps/workbench/test/test_helper.rb                 |  8 +-----
 sdk/python/arvados/commands/keepdocker.py          |  2 +-
 services/api/test/fixtures/pipeline_instances.yml  | 33 ++++++++++++++++++++++
 4 files changed, 37 insertions(+), 11 deletions(-)

       via  39507a40922e11e6863e4dd788ad3231e6fb3224 (commit)
       via  0b1b373da53fe7177a7f62523ef30ca79cfbea53 (commit)
       via  6d324fb5962e8425393c921c2def4aa1506c7230 (commit)
       via  c2e491ff35fe12d895587a6e7cf0cc9f1f7bfcd9 (commit)
      from  0226ff322cc71b540f3ca7469ad1ecf1af95d8cd (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 39507a40922e11e6863e4dd788ad3231e6fb3224
Merge: 0b1b373 c2e491f
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 25 17:12:55 2014 -0400

    Merge branch 'master' into 3889-functional-testing


commit 0b1b373da53fe7177a7f62523ef30ca79cfbea53
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 25 17:11:31 2014 -0400

    3889: Since all offending tests are fixed, update test_helper to generate an error if any functional test performs more than one action in on test in the future.

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index efb520a..72469bc 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -160,13 +160,7 @@ class ActionController::TestCase
   def check_counter action
     @counter += 1
     if @counter == 2
-      # TODO: when existing mistakes are fixed, start failing broken
-      # test cases like this:
-      #
-      # assert_equal 1, 2, "Multiple actions in functional test"
-      #
-      # Meanwhile, just warn (just once per test case):
-      $stderr.puts " [WARNING: Multiple actions in functional test]"
+      assert_equal 1, 2, "Multiple actions in functional test"
     end
   end
 

commit 6d324fb5962e8425393c921c2def4aa1506c7230
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 25 16:43:54 2014 -0400

    3889: update the test "update script_parameters one at a time using merge param" to use fixture instead of create a new pipeline instance.

diff --git a/apps/workbench/test/functional/pipeline_instances_controller_test.rb b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
index 8af7c1b..7f60689 100644
--- a/apps/workbench/test/functional/pipeline_instances_controller_test.rb
+++ b/apps/workbench/test/functional/pipeline_instances_controller_test.rb
@@ -31,9 +31,9 @@ class PipelineInstancesControllerTest < ActionController::TestCase
   end
 
   test "update script_parameters one at a time using merge param" do
-    create_instance_long_enough_to do |new_instance_uuid, template_fixture|
+      template_fixture = api_fixture('pipeline_templates')['two_part']
       post :update, {
-        id: new_instance_uuid,
+        id: api_fixture("pipeline_instances")["pipeline_to_merge_params"]["uuid"],
         pipeline_instance: {
           components: {
             "part-two" => {
@@ -60,7 +60,6 @@ class PipelineInstancesControllerTest < ActionController::TestCase
           assert_equal orig_params[k].to_json, new_params[k.to_sym].to_json
         end
       end
-    end
   end
 
   test "component rendering copes with unexpeceted components format" do
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index 7acc707..ccbc90b 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -74,3 +74,36 @@ pipeline_with_tagged_collection_input:
       script_parameters:
         input:
           value: zzzzz-4zz18-znfnqtbbv4spc3w
+
+pipeline_to_merge_params:
+  name: pipeline_to_merge_params
+  state: Ready
+  uuid: zzzzz-d1hrv-1yfj6dcba4321k3
+  pipeline_template_uuid: zzzzz-p5p6p-aox0k0ofxrystgw
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  created_at: <%= 3.1.minute.ago.to_s(:db) %>
+  components:
+    part-one:
+      script_parameters:
+        input:
+          required: true
+          dataclass: Collection
+          title: "Foo/bar pair"
+          description: "Provide a collection containing at least two files."
+    part-two:
+      script_parameters:
+        input:
+          output_of: part-one
+        integer_with_default:
+          default: 123
+        integer_with_value:
+          value: 123
+        string_with_default:
+          default: baz
+        string_with_value:
+          value: baz
+        plain_string: qux
+        array_with_default:
+          default: [1,1,2,3,5]
+        array_with_value:
+          value: [1,1,2,3,5]

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


hooks/post-receive
--