[ARVADOS] updated: 0f3960f8f56c2330c07bc6f22d826279a8cd84e5

git at public.curoverse.com git at public.curoverse.com
Wed Mar 11 17:19:19 EDT 2015


Summary of changes:
 .../test/controllers/actions_controller_test.rb    | 24 +++++++++++-----------
 doc/_includes/_navbar_top.liquid                   | 12 +++++++++++
 sdk/python/arvados/arvfile.py                      |  8 +++++---
 sdk/python/tests/test_stream.py                    | 14 +++++++++++++
 4 files changed, 43 insertions(+), 15 deletions(-)

       via  0f3960f8f56c2330c07bc6f22d826279a8cd84e5 (commit)
       via  00c9cd4ecab3683d95118ab9d68310ac5069e9f6 (commit)
       via  e8d8093ca628976ad426e61743b6d3ba49d6e4e2 (commit)
       via  15442761cb6747628b83c54840f7d2f658bdcf2c (commit)
       via  09c24107e54ff5466193b32277df3f7b0d65a4d4 (commit)
       via  5645698b214f45da413eef49598b7a50508a2be2 (commit)
       via  0c68efd395ac7befddf5ad0df6d14e9c0c0450a5 (commit)
       via  3e157b65c2984537de1615c3fc8e41272d45ea69 (commit)
       via  57b96147e575d7630ddf81cbb2c554d3adc9c7e2 (commit)
       via  bef8e622d0102f27b1e49f59a8a3ef398c694c97 (commit)
       via  e8ced6e0a71faef85388ceddefca8292bc4432dd (commit)
       via  26ad23e1fe6fedba8e6b69fba6d19a724bc9b615 (commit)
      from  b0cf100405e0dd7e4913194cd88b71ff74cf1773 (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 0f3960f8f56c2330c07bc6f22d826279a8cd84e5
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Mar 11 16:36:51 2015 -0400

    5145: include manifest text in assert error message to identify the cause of test failure in jenkins.

diff --git a/apps/workbench/test/controllers/actions_controller_test.rb b/apps/workbench/test/controllers/actions_controller_test.rb
index d8c17c9..8745d96 100644
--- a/apps/workbench/test/controllers/actions_controller_test.rb
+++ b/apps/workbench/test/controllers/actions_controller_test.rb
@@ -97,19 +97,19 @@ class ActionsControllerTest < ActionController::TestCase
     streams.each do |stream|
       if stream.start_with? './dir1'
         # dir1 stream
-        assert stream.include?(':alice(1)'), 'Not found: alice(1) in dir1'
-        assert stream.include?(':alice.txt'), 'Not found: alice.txt in dir1'
-        assert stream.include?(':alice(1).txt'), 'Not found: alice(1).txt in dir1'
-        assert stream.include?(':bob.txt'), 'Not found: bob.txt in dir1'
-        assert stream.include?(':carol.txt'), 'Not found: carol.txt in dir1'
+        assert stream.include?(':alice(1)'), "Not found: alice(1) in dir1 in manifest text #{manifest_text}"
+        assert stream.include?(':alice.txt'), "Not found: alice.txt in dir1 in manifest text #{manifest_text}"
+        assert stream.include?(':alice(1).txt'), "Not found: alice(1).txt in dir1 in manifest text #{manifest_text}"
+        assert stream.include?(':bob.txt'), "Not found: bob.txt in dir1 in manifest text #{manifest_text}"
+        assert stream.include?(':carol.txt'), "Not found: carol.txt in dir1 in manifest text #{manifest_text}"
       elsif stream.start_with? './dir2'
         # dir2 stream
-        assert stream.include?(':alice.txt'), 'Not found: alice.txt in dir2'
-        assert stream.include?(':alice(1).txt'), 'Not found: alice(1).txt in dir2'
+        assert stream.include?(':alice.txt'), "Not found: alice.txt in dir2 in manifest text #{manifest_text}"
+        assert stream.include?(':alice(1).txt'), "Not found: alice(1).txt in dir2 in manifest text #{manifest_text}"
       elsif stream.start_with? '. '
         # . stream
-        assert stream.include?(':foo'), 'Not found: foo in .'
-        assert stream.include?(':foo(1)'), 'Not found: foo(1) in .'
+        assert stream.include?(':foo'), "Not found: foo in . in manifest text #{manifest_text}"
+        assert stream.include?(':foo(1)'), "Not found: foo(1) in . in manifest text #{manifest_text}"
       end
     end
   end
@@ -159,8 +159,8 @@ class ActionsControllerTest < ActionController::TestCase
     manifest_text = collection['manifest_text']
 
     streams = manifest_text.split "\n"
-    assert_equal 1, streams.length
-    assert manifest_text.include?('foo'), 'Found foo in new collection manifest text'
-    assert manifest_text.include?('foo(1)'), 'Found foo(1) in new collection manifest text'
+    assert_equal 1, streams.length, "Incorrect number of streams in #{manifest_text}"
+    assert manifest_text.include?('foo'), "Not found foo in new collection manifest text #{manifest_text}"
+    assert manifest_text.include?('foo(1)'), "Not found foo(1) in new collection manifest text #{manifest_text}"
   end
 end

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list