[ARVADOS] updated: e8670f2a3e44458c963bb4b08a57d812a9b9d902
git at public.curoverse.com
git at public.curoverse.com
Thu Aug 21 11:39:12 EDT 2014
Summary of changes:
.../app/assets/javascripts/pipeline_instances.js | 33 ++-
apps/workbench/app/assets/javascripts/tab_panes.js | 1 +
.../workbench/app/assets/stylesheets/jobs.css.scss | 2 +-
.../controllers/pipeline_instances_controller.rb | 4 +-
apps/workbench/app/helpers/jobs_helper.rb | 19 ++
.../app/helpers/pipeline_instances_helper.rb | 21 --
apps/workbench/app/views/jobs/_show_log.html.erb | 25 +-
.../pipeline_instances/_show_components.html.erb | 16 +-
.../_show_components_running.html.erb | 63 +++---
.../views/pipeline_instances/_show_log.html.erb | 6 +
.../workbench/test/integration/collections_test.rb | 2 +
apps/workbench/test/integration/logins_test.rb | 2 +
doc/images/workbench-move-selected.png | Bin 0 -> 11267 bytes
.../create-standard-objects.html.textile.liquid | 25 +-
doc/install/install-api-server.html.textile.liquid | 8 +-
.../getting_started/workbench.html.textile.liquid | 2 +-
doc/user/reference/api-tokens.html.textile.liquid | 8 +-
...nning-pipeline-command-line.html.textile.liquid | 2 +-
doc/user/topics/tutorial-job1.html.textile.liquid | 4 +-
.../tutorial-firstscript.html.textile.liquid | 2 +-
.../tutorials/tutorial-keep.html.textile.liquid | 8 +-
...tutorial-pipeline-workbench.html.textile.liquid | 28 +--
sdk/cli/bin/crunch-job | 5 +-
sdk/python/arvados/api.py | 6 +-
sdk/python/arvados/collection.py | 42 +++-
sdk/python/arvados/commands/put.py | 17 +-
sdk/python/arvados/config.py | 3 +
sdk/python/arvados/keep.py | 251 +++++++++++++--------
sdk/python/arvados/stream.py | 7 +-
sdk/python/bin/arv-get | 7 +-
sdk/python/tests/arvados_testutil.py | 14 --
sdk/python/tests/run_test_server.py | 102 +++++++--
sdk/python/tests/test_arv_put.py | 82 +++----
sdk/python/tests/test_collections.py | 99 ++++----
sdk/python/tests/test_keep_client.py | 221 +++++++-----------
sdk/python/tests/test_keep_locator.py | 32 ++-
sdk/python/tests/test_websockets.py | 8 +-
37 files changed, 660 insertions(+), 517 deletions(-)
create mode 100644 apps/workbench/app/views/pipeline_instances/_show_log.html.erb
create mode 100644 doc/images/workbench-move-selected.png
via e8670f2a3e44458c963bb4b08a57d812a9b9d902 (commit)
via f16be1736d705278ae39bde3fc6d6d9d1f302fa7 (commit)
via 96fefe2373e7965311e1376dc0a54cf16ec9b415 (commit)
via 9beaaf14365459a028ca647488822f31bc2a26a9 (commit)
via cf9e77519d9955a2c8514e229dff099775d06af8 (commit)
via 17f836f358b242798a34e34abb0ec4b12cdff1df (commit)
via 8598092dfa7a5036417bba209a494c51812e9374 (commit)
via 5d8e0b2caf01c6d78f7de20382742b6516697cd9 (commit)
via 05bea2c50474edeb9d0e3fb8daaf838b58ea9a54 (commit)
via 40d92dda0dd3e31cbfd5b887ea8465f9940b7540 (commit)
via 3b9b5c14f6b1cd0cbed75e0d4adf36e10323dbe7 (commit)
via da01d7e185a6ce5e96d542c180856ce84e94ed63 (commit)
via e17db6aa8bae683f31d06500bbd78b043dce8d9a (commit)
via 327e1768a130476a411baf4cd4fb602f7a73c5ed (commit)
via f05bc0963563ab50341ff042439462b631894de6 (commit)
via 1afe2c7bbb571004736daf347f5178a27128704c (commit)
via f6e6e01802e09e1a108c067519d361caf0fc606f (commit)
via 35a3223ee35279c04552d5d3d372998711a956ab (commit)
via 1a2947bd5c35d58a347111ad8a9f4fc50aa1d6b3 (commit)
via 57c56feabe58a4b49d0699c158086c13a5cdf023 (commit)
via 33755fab93fb604a5e663089ece0fe6d3f690fe4 (commit)
via de3b2f9a31e7d6df9fb53fff149f5ee43d1664d0 (commit)
via e13874a4bb666423c5b2ddf1ebb517a10789f4c0 (commit)
from 897e6cc8175865575a809e9fcc6d40ea566ee930 (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 e8670f2a3e44458c963bb4b08a57d812a9b9d902
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Aug 21 11:39:09 2014 -0400
3504: Set the capybara driver explicitly so tests pass again.
diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 0e5f219..fff5db7 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -15,6 +15,8 @@ class CollectionsTest < ActionDispatch::IntegrationTest
end
test "can download an entire collection with a reader token" do
+ Capybara.current_driver = :rack_test
+
uuid = api_fixture('collections')['foo_file']['uuid']
token = api_fixture('api_client_authorizations')['active_all_collections']['api_token']
url_head = "/collections/download/#{uuid}/#{token}/"
diff --git a/apps/workbench/test/integration/logins_test.rb b/apps/workbench/test/integration/logins_test.rb
index 9daf831..adc35d0 100644
--- a/apps/workbench/test/integration/logins_test.rb
+++ b/apps/workbench/test/integration/logins_test.rb
@@ -8,6 +8,8 @@ class LoginsTest < ActionDispatch::IntegrationTest
end
test "trying to use expired token redirects to login page" do
+ Capybara.current_driver = :rack_test
+
visit page_with_token('expired_trustedclient')
buttons = all("a.btn", text: /Log in/)
assert_equal(1, buttons.size, "Failed to find one login button")
commit f16be1736d705278ae39bde3fc6d6d9d1f302fa7
Merge: 897e6cc 96fefe2
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Aug 21 11:04:17 2014 -0400
Merge remote-tracking branch 'origin/master' into 3504-clients-compatible-with-3036
diff --cc sdk/python/arvados/commands/put.py
index eec63c0,e4b763a..8cf56b6
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@@ -445,10 -450,9 +450,10 @@@ def main(arguments=None, stdout=sys.std
output = ','.join(writer.data_locators())
else:
# Register the resulting collection in Arvados.
- collection = arvados.api().collections().create(
+ collection = api_client.collections().create(
body={
'manifest_text': writer.manifest_text(),
+ 'owner_uuid': project_link['tail_uuid']
},
).execute()
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list