[ARVADOS] updated: 2c16f4fbf9408bb758a0f54cae4058dccef4c2a5

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/projects_test.rb  |   2 +-
 services/api/lib/eventbus.rb                      | 147 ++++++++++++++--------
 services/api/test/fixtures/groups.yml             |   4 +-
 services/api/test/fixtures/jobs.yml               |   6 +-
 services/api/test/fixtures/pipeline_instances.yml |   4 +-
 services/api/test/integration/websocket_test.rb   |  43 +++++++
 6 files changed, 143 insertions(+), 63 deletions(-)

       via  2c16f4fbf9408bb758a0f54cae4058dccef4c2a5 (commit)
       via  c1efd42bfbb5bc7ff9ac275643ee7a0c4e44012b (commit)
       via  0862d7206c66e8cc435de1d379c1a3ed389c1c87 (commit)
       via  cf1097ef1225c05eb4431093a4971739a3ee5a37 (commit)
       via  563b588da606aa38cdfd8a35fbc70c7414678747 (commit)
       via  e3fe23ff86e3f5f19c0a76779f957adf1310b949 (commit)
       via  de3bb6cb95b9699ff6eea6ac836c4598cec331a5 (commit)
       via  fdaaff3165642f03d46a628050d6dfb04cd37565 (commit)
       via  21ccdae70baaca0c7aeca8542f2a0a431f06c313 (commit)
       via  74e7f636d3ec2f3a20640b721a3fd76fd23cd788 (commit)
      from  1bde97d8aa4d670c25015284e97281e1af163dda (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 2c16f4fbf9408bb758a0f54cae4058dccef4c2a5
Merge: c1efd42 0862d72
Author: radhika <radhika at curoverse.com>
Date:   Fri Oct 24 10:19:19 2014 -0400

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


commit c1efd42bfbb5bc7ff9ac275643ee7a0c4e44012b
Author: radhika <radhika at curoverse.com>
Date:   Fri Oct 24 10:17:56 2014 -0400

    4091: adjust the test fixture to use less data to match the limit size of 100 for the Jobs and pipelines tab in project.

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 66b62c3..e477ae9 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 200 jobs and 10 pipelines', 2, 200],
+    ['project with 2 pipelines and 100 jobs', 2, 100],
     ['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 764261d..58c52f9 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_200_jobs:
+project_with_2_pipelines_and_100_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_200_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 200 jobs
+  name: project with 2 pipelines and 100 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 1381078..6ad6443 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_200_jobs
-<% for i in 1..200 do %>
-job_<%=i%>_of_200:
+# jobs in project_with_2_pipelines_and_100_jobs
+<% for i in 1..100 do %>
+job_<%=i%>_of_100:
   uuid: zzzzz-8i9sb-0vsrcqi7whch<%= i.to_s.rjust(3, '0') %>
   created_at: <%= i.minute.ago.to_s(:db) %>
   owner_uuid: zzzzz-j7d0g-nnjobspipelines
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index 53305ad..3444264 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -175,9 +175,9 @@ pipeline_<%=i%>_of_10:
           title: foo instance input
 <% end %>
 
-# pipelines in project_with_2_pipelines_and_200_jobs
+# pipelines in project_with_2_pipelines_and_100_jobs
 <% for i in 0..1 do %>
-pipeline_<%=i%>_of_2_pipelines_and_200_jobs:
+pipeline_<%=i%>_of_2_pipelines_and_100_jobs:
   name: pipeline_<%= i %>
   state: New
   uuid: zzzzz-d1hrv-abcgneyn6brx<%= i.to_s.rjust(3, '0') %>

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


hooks/post-receive
--