[ARVADOS] updated: f22dda84271714c924c322bafba5e9f184e4fb33

git at public.curoverse.com git at public.curoverse.com
Mon Feb 16 10:57:14 EST 2015


Summary of changes:
 apps/workbench/app/assets/javascripts/event_log.js | 312 ---------------------
 .../javascripts/{event_log.js => job_log_graph.js} |  79 +-----
 .../app/controllers/collections_controller.rb      |   8 +-
 apps/workbench/app/views/jobs/_show_log.html.erb   |   1 +
 .../controllers/collections_controller_test.rb     |  45 +++
 .../test/integration/anonymous_access_test.rb      |  19 +-
 apps/workbench/test/integration/websockets_test.rb |  14 +-
 doc/_config.yml                                    |   3 +
 doc/_includes/_events_py.liquid                    |  13 +
 doc/sdk/python/events.html.textile.liquid          |  12 +
 doc/user/topics/arv-web.html.textile.liquid        |  98 +++++++
 docker/arv-web/Dockerfile                          |  15 +
 docker/{api => arv-web}/apache2_foreground.sh      |   3 +-
 docker/arv-web/apache2_vhost                       |  19 ++
 docker/build_tools/Makefile                        |   6 +
 sdk/python/arvados/events.py                       |  18 +-
 sdk/python/tests/arvados_testutil.py               |  23 +-
 sdk/python/tests/run_test_server.py                |   4 +-
 sdk/python/tests/test_arv_put.py                   |  10 +-
 sdk/python/tests/test_collections.py               |   4 +-
 .../controllers/arvados/v1/groups_controller.rb    |   2 +-
 .../controllers/arvados/v1/schema_controller.rb    |   5 +
 .../api/app/models/api_client_authorization.rb     |   4 +
 services/api/app/models/arvados_model.rb           |   4 +
 services/api/app/models/collection.rb              |   2 +
 services/api/lib/load_param.rb                     |  12 +-
 services/api/test/fixtures/collections.yml         |  37 +++
 .../arvados/v1/collections_controller_test.rb      |  23 ++
 .../api/test/integration/collections_api_test.rb   |  21 ++
 services/api/test/integration/groups_test.rb       |  21 +-
 services/api/test/unit/collection_test.rb          |   9 +
 services/arv-web/README                            |   6 +
 services/arv-web/arv-web.py                        | 252 +++++++++++++++++
 services/arv-web/sample-cgi-app/docker_image       |   1 +
 services/arv-web/sample-cgi-app/public/.htaccess   |   3 +
 services/arv-web/sample-cgi-app/public/index.cgi   |   4 +
 .../sample-cgi-app/tmp/.keepkeep}                  |   0
 services/arv-web/sample-rack-app/config.ru         |   4 +
 services/arv-web/sample-rack-app/docker_image      |   1 +
 .../sample-rack-app/public/.keepkeep}              |   0
 .../sample-rack-app/tmp/.keepkeep}                 |   0
 services/arv-web/sample-static-page/docker_image   |   1 +
 .../arv-web/sample-static-page/public/index.html   |   6 +
 .../sample-static-page/tmp/.keepkeep}              |   0
 services/arv-web/sample-wsgi-app/docker_image      |   1 +
 services/arv-web/sample-wsgi-app/passenger_wsgi.py |   3 +
 .../sample-wsgi-app/public/.keepkeep}              |   0
 .../sample-wsgi-app/tmp/.keepkeep}                 |   0
 services/fuse/arvados_fuse/__init__.py             |  14 +-
 services/fuse/setup.py                             |   2 +-
 services/fuse/tests/test_mount.py                  |  21 +-
 .../arvnodeman/computenode/dispatch/__init__.py    |   2 +-
 services/nodemanager/arvnodeman/config.py          |   3 +-
 services/nodemanager/setup.py                      |   2 +-
 .../nodemanager/tests/test_computenode_dispatch.py |  22 +-
 services/nodemanager/tests/testutil.py             |   6 +-
 56 files changed, 762 insertions(+), 438 deletions(-)
 copy apps/workbench/app/assets/javascripts/{event_log.js => job_log_graph.js} (83%)
 create mode 100644 doc/_includes/_events_py.liquid
 create mode 100644 doc/sdk/python/events.html.textile.liquid
 create mode 100644 doc/user/topics/arv-web.html.textile.liquid
 create mode 100644 docker/arv-web/Dockerfile
 copy docker/{api => arv-web}/apache2_foreground.sh (66%)
 create mode 100644 docker/arv-web/apache2_vhost
 create mode 100644 services/arv-web/README
 create mode 100755 services/arv-web/arv-web.py
 create mode 100644 services/arv-web/sample-cgi-app/docker_image
 create mode 100644 services/arv-web/sample-cgi-app/public/.htaccess
 create mode 100755 services/arv-web/sample-cgi-app/public/index.cgi
 copy services/{fuse/tests/__init__.py => arv-web/sample-cgi-app/tmp/.keepkeep} (100%)
 create mode 100644 services/arv-web/sample-rack-app/config.ru
 create mode 100644 services/arv-web/sample-rack-app/docker_image
 copy services/{fuse/tests/__init__.py => arv-web/sample-rack-app/public/.keepkeep} (100%)
 copy services/{fuse/tests/__init__.py => arv-web/sample-rack-app/tmp/.keepkeep} (100%)
 create mode 100644 services/arv-web/sample-static-page/docker_image
 create mode 100644 services/arv-web/sample-static-page/public/index.html
 copy services/{fuse/tests/__init__.py => arv-web/sample-static-page/tmp/.keepkeep} (100%)
 create mode 100644 services/arv-web/sample-wsgi-app/docker_image
 create mode 100644 services/arv-web/sample-wsgi-app/passenger_wsgi.py
 copy services/{fuse/tests/__init__.py => arv-web/sample-wsgi-app/public/.keepkeep} (100%)
 copy services/{fuse/tests/__init__.py => arv-web/sample-wsgi-app/tmp/.keepkeep} (100%)

       via  f22dda84271714c924c322bafba5e9f184e4fb33 (commit)
       via  0cefa4c0f3c1b16884b04d6273bd8730166d69ba (commit)
       via  4c5352de29ca583c41d9babf795983ee4ea3b78e (commit)
       via  7ef27804d92e2c38ff6b22aab4b113b3e1817bf5 (commit)
       via  175c31a1cc695285c035ca2a54d5b964ab4b1d5f (commit)
       via  e1999050ade633163524cd9d87d0b77f8b5bdfdc (commit)
       via  da298b0d96a1e49a1330a4486dcbe22d92d1d743 (commit)
       via  d27fd3e2648e47f014f7da67056825aca3724004 (commit)
       via  1128f6e0d62f71f4ee91ab609c918ae5bb291edd (commit)
       via  1bcfe8651af341c6e7cd01a19443c7c288efa932 (commit)
       via  d5809a1e62e1b1a3984fff88118e036b1f174ff1 (commit)
       via  50df4956c5b0e93efd781fbb070d9d5d30d39eda (commit)
       via  606375516f678222465f2643b8162c6973bb28d2 (commit)
       via  398a5ef03226f2f3ba06b6ad05a61f3a4b403cf7 (commit)
       via  820ce7ad92cba95587800a275e14bbf24670898f (commit)
       via  91abe2648d8ca1a3a5185e94beb505ad33db9e2c (commit)
       via  a67bb34f6f19662f0a30e4aa670774c4595cb7a4 (commit)
       via  7a14311a666f471fe34c95759b40ba10b1813ab7 (commit)
       via  2917d8c1e42d2c4569f131778febb18db7445ac4 (commit)
       via  61fd9276456c112a4e22273227b0feafed35530f (commit)
       via  5dbf5c8ea2d9eb2bc8e10a03ca625f12ed71f12c (commit)
       via  c9ff74363edc2f3271c117184be2d1ad7fad633a (commit)
       via  da2492bfc43032c3374b6509a7208127ec48093a (commit)
       via  26d0d60ce820b3b30d6645839c9c1af354e7498d (commit)
       via  46efb1e7f49d08095a6a49a4c6aff045c5eb6f16 (commit)
       via  f5a0a6337d620ac12f7fffea65d0803d46dcb87e (commit)
       via  78596140bd879feb2eacd899060e5ab75a5c94f3 (commit)
       via  2d7883822203e66afee1a36c7e86a844bc23719c (commit)
       via  8233babd1d979b545e0b8f15455787af66307d9a (commit)
       via  29e2e288979dc11d690189532ca24af949d66c8a (commit)
       via  63ea99a3f7dbc8cd484d32a0f42d766d2b0c3743 (commit)
       via  04a8e038125c6ffa3c912ba6b1fd0b31af01e7ad (commit)
       via  1060cff7480331bcad2b4564e270922b2b3b1f94 (commit)
       via  b4fd2ab4e409e36f894c1fb27144e4fa2854f389 (commit)
       via  2ab024a39d41977cb56c699cbc0bca19b8ca3ac9 (commit)
       via  003f0f21e2a7052b29f375b725f90668e46d49b8 (commit)
       via  594a1e9eb632ab9deaee7d596e3004b48277e2cc (commit)
       via  962ca37032fa5170b55e2661f3b577d8497d1fe9 (commit)
       via  d2dd87596f3034fd6250e8c957ee4e97a2939470 (commit)
       via  9175278147b9aaaa9dc09f73e34e20f07a791c33 (commit)
       via  964ab3dd90ff1508efc0c77378cde2b3a4da1029 (commit)
       via  f9732ad8460d013c2f28363655d0d1b91894dca5 (commit)
       via  9d6e2ff4e27718938a72455917f2e7b62a8c66dc (commit)
       via  b97ac7f96234cbbb491bdbaade840ab50802f357 (commit)
       via  7d4e2529d04c3649ffecdce7a9e1f9835387454d (commit)
       via  013c95756d5578e596fbe3c21e1e0a3e7a1b0cc3 (commit)
       via  ea84b1dc3c09fbb0ab72d15767e4cacb8f37b12a (commit)
       via  a91c9255e07d97ab23e77228ef17b8c0416c31d7 (commit)
       via  ddb2032b5396a02ce63bddbf55bbc624540a14f6 (commit)
      from  f8f654db2a5efc85a358dfd126be4ccb1abb322d (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 f22dda84271714c924c322bafba5e9f184e4fb33
Merge: f8f654d 0cefa4c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Feb 16 10:59:23 2015 -0500

    Merge branch 'master' into 4823-python-sdk-writable-collection-api
    
    Conflicts:
    	sdk/python/tests/arvados_testutil.py
    	services/fuse/arvados_fuse/__init__.py

diff --cc sdk/python/tests/arvados_testutil.py
index aa0da98,378e93f..2926b20
--- a/sdk/python/tests/arvados_testutil.py
+++ b/sdk/python/tests/arvados_testutil.py
@@@ -40,30 -53,17 +53,30 @@@ def fake_requests_response(code, body, 
      r.raw = io.BytesIO(body)
      return r
  
 +def mock_put_responses(body, *codes, **headers):
 +    m = mock.MagicMock()
 +    if isinstance(body, tuple):
 +        codes = list(codes)
 +        codes.insert(0, body)
-         m.return_value.put.side_effect = (fake_requests_response(code, b, **headers) for b, code in codes)
++        m.return_value.put.side_effect = queue_with((fake_requests_response(code, b, **headers) for b, code in codes))
 +    else:
-         m.return_value.put.side_effect = (fake_requests_response(code, body, **headers) for code in codes)
++        m.return_value.put.side_effect = queue_with((fake_requests_response(code, body, **headers) for code in codes))
 +    return mock.patch('requests.Session', m)
 +
  def mock_get_responses(body, *codes, **headers):
 -    return mock.patch('requests.get', side_effect=queue_with((
 -        fake_requests_response(code, body, **headers) for code in codes)))
 +    m = mock.MagicMock()
-     m.return_value.get.side_effect = (fake_requests_response(code, body, **headers) for code in codes)
++    m.return_value.get.side_effect = queue_with((fake_requests_response(code, body, **headers) for code in codes))
 +    return mock.patch('requests.Session', m)
  
 -def mock_put_responses(body, *codes, **headers):
 -    return mock.patch('requests.put', side_effect=queue_with((
 -        fake_requests_response(code, body, **headers) for code in codes)))
 +def mock_get(side_effect):
 +    m = mock.MagicMock()
 +    m.return_value.get.side_effect = side_effect
 +    return mock.patch('requests.Session', m)
  
 -def mock_requestslib_responses(method, body, *codes, **headers):
 -    return mock.patch(method, side_effect=queue_with((
 -        fake_requests_response(code, body, **headers) for code in codes)))
 +def mock_put(side_effect):
 +    m = mock.MagicMock()
 +    m.return_value.put.side_effect = side_effect
 +    return mock.patch('requests.Session', m)
  
  class MockStreamReader(object):
      def __init__(self, name='.', *data):
diff --cc sdk/python/tests/test_collections.py
index 5baf30a,dbbe3f5..8e513c6
--- a/sdk/python/tests/test_collections.py
+++ b/sdk/python/tests/test_collections.py
@@@ -721,12 -718,12 +721,12 @@@ class CollectionWriterTestCase(unittest
      def test_write_three_replicas(self):
          client = mock.MagicMock(name='api_client')
          self.mock_keep_services(client, status=200, service_type='disk', count=6)
 -        writer = self.foo_writer(api_client=client, replication=3)
          with self.mock_keep(
-                 None, 200, 500, 200, 500, 200, 200,
+                 None, 500, 500, 500, 200, 200, 200,
                  **{'x-keep-replicas-stored': 1}) as keepmock:
 +            writer = self.foo_writer(api_client=client, replication=3)
              writer.manifest_text()
-             self.assertEqual(5, keepmock.call_count)
+             self.assertEqual(6, keepmock.call_count)
  
      def test_write_whole_collection_through_retries(self):
          writer = self.foo_writer(num_retries=2)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list