[ARVADOS] updated: fbd2326841005c1a288c65502dc038f26923ed65

git at public.curoverse.com git at public.curoverse.com
Fri Nov 7 15:55:22 EST 2014


Summary of changes:
 apps/workbench/Gemfile                             |   5 +
 apps/workbench/Gemfile.lock                        |  10 +
 .../app/assets/javascripts/selection.js.erb        |   2 +-
 .../app/controllers/application_controller.rb      |  15 +-
 .../app/controllers/collections_controller.rb      |   6 +-
 .../app/views/collections/_show_files.html.erb     |  61 ++--
 .../test/functional/collections_controller_test.rb |  16 +-
 .../test/functional/projects_controller_test.rb    |  12 +
 .../workbench/test/integration/collections_test.rb | 132 +++++++--
 apps/workbench/test/integration/jobs_test.rb       |   2 +-
 crunch_scripts/run-command                         | 248 ++++++++++++----
 doc/_config.yml                                    |   1 +
 doc/install/index.html.textile.liquid              |  18 +-
 doc/user/topics/arv-run.html.textile.liquid        | 166 +++++++++++
 doc/user/topics/run-command.html.textile.liquid    | 118 ++++++--
 docker/api/application.yml.in                      |   2 +
 docker/arvdock                                     |   6 +-
 sdk/cli/bin/arv                                    |   9 +-
 sdk/python/arvados/commands/run.py                 | 316 +++++++++++++++++++++
 sdk/python/arvados/commands/ws.py                  |  14 +-
 sdk/python/arvados/events.py                       |  12 +-
 sdk/python/bin/arv-run                             |   4 +
 sdk/python/setup.py                                |   3 +-
 services/api/app/models/user.rb                    |  12 +-
 services/api/config/application.default.yml        |   4 +
 services/api/script/crunch-dispatch.rb             |  61 ++--
 services/api/test/fixtures/groups.yml              |  14 +
 .../arvados/v1/groups_controller_test.rb           |  21 +-
 services/api/test/unit/user_test.rb                |  76 +++++
 .../nodemanager/arvnodeman/computenode/__init__.py |  22 +-
 services/nodemanager/arvnodeman/daemon.py          |  15 +-
 services/nodemanager/tests/test_computenode.py     |  30 +-
 services/nodemanager/tests/test_daemon.py          | 119 +++++---
 services/nodemanager/tests/testutil.py             |   2 +-
 34 files changed, 1320 insertions(+), 234 deletions(-)
 create mode 100644 doc/user/topics/arv-run.html.textile.liquid
 create mode 100644 sdk/python/arvados/commands/run.py
 create mode 100755 sdk/python/bin/arv-run

       via  fbd2326841005c1a288c65502dc038f26923ed65 (commit)
       via  3bbb988777079718338e3e6cb9c6c9b5399be800 (commit)
       via  1bb7352bf1425dc9acf028f863eaff1e5c207571 (commit)
       via  04c1723357282d0ef2890e570cfab84d35b99da4 (commit)
       via  b5ed27eba73076e416a285c7ea240fe0d8f52568 (commit)
       via  3e1ef3ebc922bd386566b6e75adf01003a2c3c96 (commit)
       via  a0ff04290d85b5608211b1fd3ccb00c2e0758503 (commit)
       via  b19b2bc95a30eed13f4cc5b155c14d862e39e503 (commit)
       via  1d3987356d0ab60c4f6c80cbd11852b4209137f4 (commit)
       via  c53b0474744b0e2e863c7aa3c4a148152f4b0e63 (commit)
       via  023517001bf8efd7d44ab33d2a79d92d2ff30a30 (commit)
       via  308a6da1a9fd716f3957b116110a932c08aefafe (commit)
       via  00767fe5d84a51fdd6d734e2842552a37bff01e5 (commit)
       via  a324727d478feb278ab35300c5b96e2349e23f3d (commit)
       via  f3b393533d3d3a4ca6ae33b4bb3b42b4bc6c8bca (commit)
       via  70f3e36eec19f68d9b8295f2f9bb597cb1d566bf (commit)
       via  0f3d2c5a4168b97666a127e41b2c94e0cdff9cb1 (commit)
       via  5acdc268c662f452de81d2d00766a879c73f8c08 (commit)
       via  7d6454e0805ff043cd523aa67e6de10fe856d698 (commit)
       via  72cf9a5814e52adb2b6c2f349cbef3de069722bb (commit)
       via  7ff49661ee6262dedb65c45801a45affa7908e40 (commit)
       via  3db43f179cf2fe1fb4077f8789d2b53588806517 (commit)
       via  2c2212b5cb3b0f09b84dea82102c6e6b33bc7dd1 (commit)
       via  5b5c9a43929d392f32f7a4db1393df2dd106cbeb (commit)
       via  60c177af3270e7a0cd7e38fdefed93eab2637839 (commit)
       via  bbfe0f05b55ba00f16e3427f6ea48a6343a4b7c8 (commit)
       via  abc28ee28670b901c59c32d91ae6b68a9ff7154a (commit)
       via  d20968afa56dd3723d9833685e232a3081053e69 (commit)
       via  ed7369d4a18d11784e666246f37fc32ac3e559c4 (commit)
       via  788ecdf8085f5e69cd3dc960f510b49f11432cb3 (commit)
       via  8ad92bb9e7950e0bf758716b40764d26ee33802c (commit)
       via  2c693ee50677969a3aa81fe1ba8fd0c702acc20c (commit)
       via  e34d6859d936f0b82f981d44be415a46b1aa61e1 (commit)
       via  611a3323ea110671c5fa021e14f93b24e4a6d7b7 (commit)
       via  18e63e25f167b25ccebbcb7eb2953c6e5d805fbb (commit)
       via  294d3c8d367c71be33a818aa463a3490fe54ad5a (commit)
       via  d5b8652f53bf2ac40cbb7fcd31597d0cd08cac98 (commit)
       via  2fe1e71c5cc17dbf06fd7b1e188fd0279c07d3ca (commit)
       via  f662e62c925d89ad466ff2271919dd6dd2ccfa86 (commit)
       via  23aea08b10f5067a6f303941db9cc45277af8ba0 (commit)
       via  f05771f1bbaa93afbda43820af483727f4a2df3a (commit)
       via  c5c8c8836cf769843e90bb90b8851f151d61b326 (commit)
       via  f8002c5955444a0eaa2f9a31d11c2187d86e9e61 (commit)
       via  31407b1e131c90895037db4e6b72b8ba00fc874e (commit)
       via  234f7303d0c4424cdb91e8b24f870a8d0f5de556 (commit)
       via  a383999f721789fa80c8bc284fdb9b11f37e8213 (commit)
       via  51de3bf2f50cae3fce8a6ffdb3528e96afe67245 (commit)
       via  0812bc1c717e5fed57d420b177f6ca9d41e81032 (commit)
       via  50efff371741949e377f8f9c11b724b1981f373a (commit)
       via  540680b267cb67d5128fbf9fc2666bdf864a0801 (commit)
       via  0edcc26fa0f04c707f0b6fd3694c3dae7572d8f7 (commit)
       via  a0c099f41a00785b6d28a105e49f40e713e78882 (commit)
       via  d071c34ca20aa86a5a053abcffb7414dbd8f4933 (commit)
       via  6ef24c81cd9d84e5022b776f63328b8ea352c4d1 (commit)
       via  fa541df794b486efa220bd83bb119e87cca8e2de (commit)
       via  04b8def3069732ac8038c39f1541cdc11cf265a0 (commit)
       via  66b6518c70a67a94317feaa47e555808bd13b015 (commit)
       via  f02109541ae4f462c4d1838d78ad06cf318098ce (commit)
       via  245c6abec4bf824ad8c8683e59ab6ee08c836cf7 (commit)
       via  556fb8540d73e3af07a5bea07e3c831fe477b958 (commit)
       via  76ad4467c9b5f223383520f04157b1721a62aa5f (commit)
       via  987c225f9f6845868ee674902090c27a5a064f42 (commit)
       via  b7fe2ea36c87fa648f019c20679b50ab462aec5a (commit)
       via  0a37e2d631fd98e2766245c4719586d38bdf10c8 (commit)
       via  2ec515c8ef7f9cae426a6490d1317333718e1d5e (commit)
       via  c79e86aff4cb20413cf0f09c52fe5066ca197deb (commit)
       via  ca65f360000d14ae987f3f6d3d15244ccf581c72 (commit)
       via  60152eec3b8852169bd4121513a25479471d10e5 (commit)
       via  7fadfb046ace2dbda699037545c5504e99446046 (commit)
       via  c0cead2ee16700cf14baba7993297e83787aedbb (commit)
       via  fee9a5e5f58a830082374e19787a44185a2a0fdb (commit)
       via  dd131dfc2686e378a7d90f5cc269340ab5adada9 (commit)
       via  3f726dd7022da6e2be816ba6cc493212596087f5 (commit)
       via  c9df4289923a621c929920fe958dbde287f29d73 (commit)
       via  0fdfa049801418ecd1faf33ec1415f3b689ea761 (commit)
       via  4f4ad25bf60751a09e316dca8c29cf3628ad7bdc (commit)
       via  c8a5c25611c964d2af8ba26b88622b70692257e4 (commit)
       via  1ad626b28816840288093d94a12ea7694201364b (commit)
      from  c1f7fd8aa615d4a91f919ce18a6085ae766a5517 (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 fbd2326841005c1a288c65502dc038f26923ed65
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Nov 7 15:55:15 2014 -0500

    4434: Assume only that if a<b are lowercase ascii, aX<bY for any X, Y, collation.

diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index f83bf53..294afc2 100644
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -141,15 +141,30 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
         filters: [['uuid', 'is_a', "arvados#collection"]],
         order: "collections.name #{order}"
       }
-      sorted_entries = json_response['items'].collect { |item| item["name"] }
+      sorted_names = json_response['items'].collect { |item| item["name"] }
+      # Here we avoid assuming too much about the database
+      # collation. Both "alice"<"Bob" and "alice">"Bob" can be
+      # correct. Hopefully it _is_ safe to assume that if "a" comes
+      # before "b" in the ascii alphabet, "aX">"bY" is never true for
+      # any strings X and Y.
+      reliably_sortable_names = sorted_names.select do |name|
+        name[0] >= 'a' and name[0] <= 'z'
+      end.uniq do |name|
+        name[0]
+      end
+      # Array#& is documented to preserve order of sorted_names.
+      sorted_names &= reliably_sortable_names
+      actually_checked_anything = false
       previous = nil
-      sorted_entries.each do |entry|
+      sorted_names.each do |entry|
         if previous
           assert_operator(previous, operator, entry,
-                          "Entries sorted incorrectly. Perhaps the application and database have mismatched locale settings?")
+                          "Entries sorted incorrectly.")
+          actually_checked_anything = true
         end
         previous = entry
       end
+      assert actually_checked_anything, "Didn't even find two names to compare."
     end
   end
 

commit 3bbb988777079718338e3e6cb9c6c9b5399be800
Merge: c1f7fd8 1bb7352
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Nov 7 15:41:40 2014 -0500

    4434: Merge branch 'master' into 4434-collation


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list