[ARVADOS] updated: c105f3566ef117227dae65396425618c586d9e10

[git at public.curoverse.com]

Summary of changes:
 .../app/views/collections/_show_files.html.erb     | 33 +++++++++++++++++-
 .../projects/_show_jobs_and_pipelines.html.erb     |  2 +-
 apps/workbench/config/application.yml.example      |  9 +++++
 .../workbench/test/integration/collections_test.rb | 39 ++++++++++++++++++++++
 apps/workbench/test/integration/projects_test.rb   |  2 +-
 services/api/config/application.yml.example        |  1 +
 services/api/test/fixtures/collections.yml         |  4 +--
 services/api/test/fixtures/groups.yml              |  4 +--
 services/api/test/fixtures/jobs.yml                |  6 ++--
 services/fuse/tests/test_mount.py                  |  2 ++
 services/nodemanager/arvnodeman/jobqueue.py        |  2 +-
 services/nodemanager/tests/test_computenode.py     |  3 +-
 services/nodemanager/tests/test_jobqueue.py        |  5 +++
 13 files changed, 99 insertions(+), 13 deletions(-)

       via  c105f3566ef117227dae65396425618c586d9e10 (commit)
       via  78fc6d80639659e30e4f15562c382c002ed6e1ef (commit)
       via  7d8d1b78a10a7045d7ef2367a45c07b023272548 (commit)
       via  9ee4a125d1796dd7b71ef1b9f255133e5cf0becc (commit)
       via  5560cdf37024ba98bb0367a65bc2176c1577496b (commit)
       via  c19bb2a3554f8bcb17cadd9c133b6fb260e70513 (commit)
       via  1edad4ad7a8c239b36b6f10565ee36cbeab67ddb (commit)
       via  550997435f03118e51571994acc07273907bc6fd (commit)
       via  89ba1124c9fd6d3167c50059dc8adea64e6147b5 (commit)
       via  f549c9f05860abfb394b550c0b2c30a5a7c33283 (commit)
       via  2d244defaaa4f5f663a5ac11cf507d7203f704e3 (commit)
       via  e34135f6779f58852558e03b1b95534c11ca07ae (commit)
      from  fb2ee4033abfae93e8f9a9af367569e7f4fa3793 (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 c105f3566ef117227dae65396425618c586d9e10
Merge: 78fc6d8 7d8d1b7
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 29 15:23:07 2014 -0400

    Merge branch 'master' into 4091-test-infinite-scrolling


commit 78fc6d80639659e30e4f15562c382c002ed6e1ef
Author: radhika <radhika at curoverse.com>
Date:   Wed Oct 29 15:21:45 2014 -0400

    4091: set the limit size to 50 for "Jobs and pipelines" tab.

diff --git a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
index 3007857..9b3755f 100644
--- a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
+++ b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
@@ -1,4 +1,4 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
-    limit: 100,
+    limit: 50,
     filters: [['uuid', 'is_a', ["arvados#job", "arvados#pipelineInstance"]]]
     }.merge(local_assigns) %>
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index e477ae9..3293867 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -549,7 +549,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
   [
     ['project with 10 pipelines', 10, 0],
-    ['project with 2 pipelines and 100 jobs', 2, 100],
+    ['project with 2 pipelines and 60 jobs', 2, 60],
     ['project with 25 pipelines', 25, 0],
   ].each do |project_name, num_pipelines, num_jobs|
     test "scroll pipeline instances tab for #{project_name} with #{num_pipelines} pipelines and #{num_jobs} jobs" do
diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index 58c52f9..97f3030 100644
--- a/services/api/test/fixtures/groups.yml
+++ b/services/api/test/fixtures/groups.yml
@@ -173,7 +173,7 @@ project_with_10_pipelines:
   description: project with 10 pipelines
   group_class: project
 
-project_with_2_pipelines_and_100_jobs:
+project_with_2_pipelines_and_60_jobs:
   uuid: zzzzz-j7d0g-nnjobspipelines
   owner_uuid: zzzzz-tpzed-user1withloadab
   created_at: 2014-04-21 15:37:48 -0400
@@ -181,7 +181,7 @@ project_with_2_pipelines_and_100_jobs:
   modified_by_user_uuid: zzzzz-tpzed-user1withloadab
   modified_at: 2014-04-21 15:37:48 -0400
   updated_at: 2014-04-21 15:37:48 -0400
-  name: project with 2 pipelines and 100 jobs
+  name: project with 2 pipelines and 60 jobs
   description: This will result in two pages in the display
   group_class: project
 
diff --git a/services/api/test/fixtures/jobs.yml b/services/api/test/fixtures/jobs.yml
index 718cfcd..40c905b 100644
--- a/services/api/test/fixtures/jobs.yml
+++ b/services/api/test/fixtures/jobs.yml
@@ -299,9 +299,9 @@ job_in_subproject:
 
 # Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
 
-# jobs in project_with_2_pipelines_and_100_jobs
-<% for i in 1..100 do %>
-job_<%=i%>_of_100:
+# jobs in project_with_2_pipelines_and_60_jobs
+<% for i in 1..60 do %>
+job_<%=i%>_of_60:
   uuid: zzzzz-8i9sb-oneof100jobs<%= i.to_s.rjust(3, '0') %>
   created_at: <%= ((i+5)/5).minute.ago.to_s(:db) %>
   owner_uuid: zzzzz-j7d0g-nnjobspipelines

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


hooks/post-receive
--