[ARVADOS] updated: 1f7dbdb87eee28f7f357c025f7b5cd7d1ccc8c7a
git at public.curoverse.com
git at public.curoverse.com
Thu Oct 16 23:33:11 EDT 2014
Summary of changes:
.../app/controllers/projects_controller.rb | 4 +-
apps/workbench/app/helpers/application_helper.rb | 9 +-
.../app/models/api_client_authorization.rb | 4 +-
apps/workbench/app/models/arvados_base.rb | 13 ++-
apps/workbench/app/models/authorized_key.rb | 6 +-
apps/workbench/app/models/collection.rb | 8 +-
apps/workbench/app/models/job.rb | 10 +--
apps/workbench/app/models/pipeline_instance.rb | 10 ++-
apps/workbench/app/models/user.rb | 5 +-
apps/workbench/app/models/virtual_machine.rb | 4 +-
.../test/functional/projects_controller_test.rb | 17 ++++
apps/workbench/test/integration/projects_test.rb | 57 ++++++-------
apps/workbench/test/test_helper.rb | 14 +++-
apps/workbench/test/unit/collection_test.rb | 31 +++++++
apps/workbench/test/unit/group_test.rb | 12 +++
apps/workbench/test/unit/job_test.rb | 30 ++++++-
apps/workbench/test/unit/pipeline_instance_test.rb | 30 ++++++-
doc/api/schema/Group.html.textile.liquid | 1 +
doc/api/schema/User.html.textile.liquid | 1 +
sdk/python/arvados/commands/ws.py | 94 +++++++++++++++++++++
sdk/python/arvados/events.py | 97 ++++++++++++++++++----
sdk/python/bin/arv-ws | 30 +------
sdk/python/tests/test_websockets.py | 38 +++++++--
services/api/app/models/arvados_model.rb | 3 +-
services/api/app/models/user.rb | 1 +
services/api/lib/eventbus.rb | 2 +-
.../test/fixtures/api_client_authorizations.yml | 6 ++
services/api/test/fixtures/collections.yml | 13 ++-
services/api/test/fixtures/groups.yml | 14 ++--
services/api/test/fixtures/jobs.yml | 20 +++--
services/api/test/fixtures/links.yml | 14 ++++
services/api/test/fixtures/pipeline_instances.yml | 28 ++++---
services/api/test/fixtures/users.yml | 14 ++++
.../functional/arvados/v1/users_controller_test.rb | 10 +++
34 files changed, 497 insertions(+), 153 deletions(-)
create mode 100644 sdk/python/arvados/commands/ws.py
via 1f7dbdb87eee28f7f357c025f7b5cd7d1ccc8c7a (commit)
via 4418304db7b297e099e99ca9f77d846f4af6c491 (commit)
via 69e4d608045afea775b77d1f41afddf0bdfcf5c6 (commit)
via d7fdbbab1f67d696906afe7a6e17e17997e1c064 (commit)
via d825508721cb4e184d03d43965cee00caee21bd6 (commit)
via d532da29a2f954f6a24ccacd1142e61b299ea292 (commit)
via 75fd0cb8bff8f0396168a8900eaba9d8e1edd65e (commit)
via 84e64f6e81c241a6dbaabea3dcafa2bad4cb188a (commit)
via bc4c747ce6b4cda9928cd318fd050c1171bff475 (commit)
via 51c8987b2dd1696c27ee1235855a47bd86dfeb82 (commit)
via ac4f4ab5c6d677096cc335af7cfc0d9b10043b93 (commit)
via 25708a232b618757d54d36e3fe545302cff9ca42 (commit)
via 0dab3a40d540b872ee689420d3fcfcebb760d15b (commit)
via d05825ffb039ddddfff00cf92837d0ca049ee364 (commit)
via 23796191a7efdae462ee7509b4641be4d63d584d (commit)
via 723f0c8477dbd1d6a5e90a29dd3003c9b00d04aa (commit)
via b3f9cef0402c67cf06f825b283d95ef5819ab93f (commit)
via 58014b961247c55093afdd1dab3e290518a54e3e (commit)
via fe21e5236f596001d22e4b28519d1c5ef32a7e3c (commit)
via 4ff82f5fdc5d0e663da809823f25155d09609cc1 (commit)
via 758d59141102b29371f44512671b9efe0cf62821 (commit)
via 7509b9e08acebd9e28ab2cea7d8b2e383c46859c (commit)
via 55888e63181a0847d3e00344fa9c7c5e747082ae (commit)
via 76d932c4916d15c2ca2668409905da4206cb38b3 (commit)
via 2774760a4ccdb65336e2aad32b5fd57fc7bc5bb3 (commit)
via 5d262f9b0206b79fca198d191d3678415cf5c338 (commit)
via a606b9a9996aa3e8a144a8328acf3f960d8d0057 (commit)
via 2f8d1a30eaca707dff086b52d5809963e6a8cc1c (commit)
from 877c538744d915852361ce0a8839d54a54bc0c9d (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 1f7dbdb87eee28f7f357c025f7b5cd7d1ccc8c7a
Merge: 4418304 69e4d60
Author: radhika <radhika at curoverse.com>
Date: Thu Oct 16 23:28:29 2014 -0400
Merge branch 'master' into 4062-infinite-scroll-repeat-issue
Conflicts:
services/api/test/fixtures/collections.yml
services/api/test/fixtures/jobs.yml
diff --cc apps/workbench/test/test_helper.rb
index eea81d1,01a79bb..d7fff5d
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@@ -61,15 -63,18 +63,21 @@@ module ApiFixtureLoade
begin
path = File.join(ApiServerForTests::ARV_API_SERVER_DIR,
'test', 'fixtures', "#{name}.yml")
- YAML.load(IO.read(path))
+ file = IO.read(path)
+ trim_index = file.index('# Test Helper trims the rest of the file')
+ file = file[0, trim_index] if trim_index
+ YAML.load(file)
end
+ keys.inject(@@api_fixtures[name]) { |hash, key| hash[key] }
end
end
- def api_fixture name
- self.class.api_fixture name
+ def api_fixture(name, *keys)
+ self.class.api_fixture(name, *keys)
+ end
+
+ def find_fixture(object_class, name)
+ object_class.find(api_fixture(object_class.to_s.pluralize.underscore,
+ name, "uuid"))
end
end
diff --cc services/api/test/fixtures/collections.yml
index abc1eea,e1e568a..c481424
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@@ -258,30 -258,11 +258,39 @@@ collection_owned_by_foo
created_at: 2014-02-03T17:22:54Z
name: collection_owned_by_foo
+ collection_to_remove_from_subproject:
+ # The Workbench tests remove this from subproject.
+ uuid: zzzzz-4zz18-subprojgonecoll
+ portable_data_hash: 2386ca6e3fffd4be5e197a72c6c80fb2+51
+ manifest_text: ". 8258b505536a9ab47baa2f4281cb932a+9 0:9:missingno\n"
+ owner_uuid: zzzzz-j7d0g-axqo7eu9pwvna1x
+ created_at: 2014-10-15T10:45:00
+ name: Collection to remove from subproject
++
+# Test Helper trims the rest of the file
+
+# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
+
+# collections in project_with_10_collections
+<% for i in 1..10 do %>
+collection_<%=i%>_of_10:
+ name: Collection_<%= i %>
+ portable_data_hash: ea10d51bcf88862dbcc36eb292017dfd+45
+ manifest_text: ". 73feffa4b7f6bb68e44cf984c85f6e88+3 0:3:baz\n"
+ uuid: zzzzz-4zz18-10gneyn6brkx<%= i.to_s.rjust(3, '0') %>
+ owner_uuid: zzzzz-j7d0g-0010collections
+ created_at: <%= i.minute.ago.to_s(:db) %>
+<% end %>
+
+# collections in project_with_201_collections
+<% for i in 1..201 do %>
+collection_<%=i%>_of_201:
+ name: Collection_<%= i %>
+ portable_data_hash: ea10d51bcf88862dbcc36eb292017dfd+45
+ manifest_text: ". 73feffa4b7f6bb68e44cf984c85f6e88+3 0:3:baz\n"
+ uuid: zzzzz-4zz18-201gneyn6brd<%= i.to_s.rjust(3, '0') %>
+ owner_uuid: zzzzz-j7d0g-0201collections
+ created_at: <%= i.minute.ago.to_s(:db) %>
+<% end %>
+
+# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
diff --cc services/api/test/fixtures/jobs.yml
index abcaad1,5e383ed..292c27e
--- a/services/api/test/fixtures/jobs.yml
+++ b/services/api/test/fixtures/jobs.yml
@@@ -285,18 -285,12 +285,28 @@@ cancelled
runtime_constraints: {}
state: Cancelled
+ job_in_subproject:
+ uuid: zzzzz-8i9sb-subprojectjob01
+ created_at: 2014-10-15 12:00:00
+ owner_uuid: zzzzz-j7d0g-axqo7eu9pwvna1x
+ log: ~
+ repository: foo
+ script: hash
+ script_version: 4fe459abe02d9b365932b8f5dc419439ab4e2577
+ state: Complete
++
+# Test Helper trims the rest of the file
+
+# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
+
+# jobs in project_with_10_pipelines_and_200_jobs
+<% for i in 1..200 do %>
+job_<%=i%>_of_200:
+ uuid: zzzzz-8i9sb-0vsrcqi7whch<%= i.to_s.rjust(3, '0') %>
+ created_at: <%= i.minute.ago.to_s(:db) %>
+ owner_uuid: zzzzz-j7d0g-nnjobspipelines
+ script_version: 7def43a4d3f20789dda4700f703b5514cc3ed250
+ state: Complete
+<% end %>
+
+# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
commit 4418304db7b297e099e99ca9f77d846f4af6c491
Author: radhika <radhika at curoverse.com>
Date: Thu Oct 16 23:19:57 2014 -0400
4062: Do not include offset in the next_page_href when objects of multiple kinds are being fetched; instead, we will rely on created_at filter alone.
Updated the tests and fixtures to expect all 200+ objects in the pipelines and jobs tab.
The test however is still not working as the created_at filter based fetch is not working.
diff --git a/apps/workbench/app/controllers/projects_controller.rb b/apps/workbench/app/controllers/projects_controller.rb
index e918099..b77a489 100644
--- a/apps/workbench/app/controllers/projects_controller.rb
+++ b/apps/workbench/app/controllers/projects_controller.rb
@@ -192,7 +192,7 @@ class ProjectsController < ApplicationController
limit: @limit,
include_linked: true,
filters: (@filters - kind_filters + [['uuid', 'is_a', type]]),
- offset: @offset)
+ )
objects.each do |object|
@name_link_for[object.andand.uuid] = objects.links_for(object, 'name').first
end
@@ -206,12 +206,10 @@ class ProjectsController < ApplicationController
attr == 'created_at' and op == nextpage_operator
end
if @objects.any?
- @offset += @objects.length
@next_page_filters += [['created_at',
nextpage_operator,
@objects.last.created_at]]
@next_page_href = url_for(partial: :contents_rows,
- offset: @offset,
filters: @next_page_filters.to_json)
else
@next_page_href = nil
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 11895ac..b623490 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -490,6 +490,10 @@ class ProjectsTest < ActionDispatch::IntegrationTest
['project with 201 collections', 201], # two pages of data
].each do |project_name, amount|
test "scroll collections tab for #{project_name} with #{amount} objects" do
+ headless = Headless.new
+ headless.start
+ Capybara.current_driver = :selenium
+
visit page_with_token 'user1_with_load'
find("#projects-menu").click
@@ -542,10 +546,14 @@ class ProjectsTest < ActionDispatch::IntegrationTest
[
['project with 10 pipelines', 10, 0],
- ['project with 10 jobs and 10 pipelines', 10, 10],
+ ['project with 200 jobs and 10 pipelines', 10, 200],
['project with 25 pipelines', 25, 0], # 20 is the page limit for this tab; hence two pages
].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
+ headless = Headless.new
+ headless.start
+ Capybara.current_driver = :selenium
+
visit page_with_token 'user1_with_load'
find("#projects-menu").click
@@ -569,7 +577,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
unexpected_items = []
object_count = 0
within('.arv-project-Jobs_and_pipelines') do
- page.execute_script "window.scrollBy(0,99999999)"
+ page.execute_script "window.scrollBy(0,999000)"
begin
wait_for_ajax
rescue
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index d1f1d22..abc1eea 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -270,7 +270,7 @@ collection_<%=i%>_of_10:
manifest_text: ". 73feffa4b7f6bb68e44cf984c85f6e88+3 0:3:baz\n"
uuid: zzzzz-4zz18-10gneyn6brkx<%= i.to_s.rjust(3, '0') %>
owner_uuid: zzzzz-j7d0g-0010collections
- created_at: <%= 1.minute.ago.to_s(:db) %>
+ created_at: <%= i.minute.ago.to_s(:db) %>
<% end %>
# collections in project_with_201_collections
@@ -281,7 +281,7 @@ collection_<%=i%>_of_201:
manifest_text: ". 73feffa4b7f6bb68e44cf984c85f6e88+3 0:3:baz\n"
uuid: zzzzz-4zz18-201gneyn6brd<%= i.to_s.rjust(3, '0') %>
owner_uuid: zzzzz-j7d0g-0201collections
- created_at: <%= 1.minute.ago.to_s(:db) %>
+ created_at: <%= i.minute.ago.to_s(:db) %>
<% end %>
# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index 345acbc..61c4b0a 100644
--- a/services/api/test/fixtures/groups.yml
+++ b/services/api/test/fixtures/groups.yml
@@ -173,15 +173,15 @@ project_with_10_pipelines:
description: project with 10 pipelines
group_class: project
-project_with_10_pipelines_and_10_jobs:
- uuid: zzzzz-j7d0g-20jobspipelines
+project_with_10_pipelines_and_200_jobs:
+ uuid: zzzzz-j7d0g-nnjobspipelines
owner_uuid: zzzzz-tpzed-user1withloadab
created_at: 2014-04-21 15:37:48 -0400
modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
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 10 jobs and 10 pipelines
+ name: project with 200 jobs and 10 pipelines
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 e6a382f..abcaad1 100644
--- a/services/api/test/fixtures/jobs.yml
+++ b/services/api/test/fixtures/jobs.yml
@@ -289,12 +289,12 @@ cancelled:
# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
-# jobs in project_with_10_pipelines_and_10_jobs
-<% for i in 1..10 do %>
-job_<%=i%>_of_10:
+# jobs in project_with_10_pipelines_and_200_jobs
+<% for i in 1..200 do %>
+job_<%=i%>_of_200:
uuid: zzzzz-8i9sb-0vsrcqi7whch<%= i.to_s.rjust(3, '0') %>
- created_at: 2014-09-01 12:00:00
- owner_uuid: zzzzz-j7d0g-20jobspipelines
+ created_at: <%= i.minute.ago.to_s(:db) %>
+ owner_uuid: zzzzz-j7d0g-nnjobspipelines
script_version: 7def43a4d3f20789dda4700f703b5514cc3ed250
state: Complete
<% end %>
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index c2dbd65..d49db20 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -155,7 +155,7 @@ pipeline_<%=i%>_of_10:
state: New
uuid: zzzzz-d1hrv-10gneyn6br1x<%= i.to_s.rjust(3, '0') %>
owner_uuid: zzzzz-j7d0g-000010pipelines
- created_at: <%= 1.minute.ago.to_s(:db) %>
+ created_at: <%= i.minute.ago.to_s(:db) %>
components:
foo:
script: foo
@@ -167,14 +167,14 @@ pipeline_<%=i%>_of_10:
title: foo instance input
<% end %>
-# pipelines in project_with_10_pipelines_and_10_jobs
+# pipelines in project_with_10_pipelines_and_200_jobs
<% for i in 1..10 do %>
-pipeline_<%=i%>_of_10_pipelines_and_10_jobs:
+pipeline_<%=i%>_of_10_pipelines_and_200_jobs:
name: pipeline_<%= i %>
state: New
uuid: zzzzz-d1hrv-abcgneyn6brx<%= i.to_s.rjust(3, '0') %>
- owner_uuid: zzzzz-j7d0g-20jobspipelines
- created_at: <%= 1.minute.ago.to_s(:db) %>
+ owner_uuid: zzzzz-j7d0g-nnjobspipelines
+ created_at: <%= i.minute.ago.to_s(:db) %>
components:
foo:
script: foo
@@ -193,7 +193,7 @@ pipeline_<%=i%>_of_25:
state: New
uuid: zzzzz-d1hrv-25xneyn6br1x<%= i.to_s.rjust(3, '0') %>
owner_uuid: zzzzz-j7d0g-000025pipelines
- created_at: <%= 1.minute.ago.to_s(:db) %>
+ created_at: <%= i.minute.ago.to_s(:db) %>
components:
foo:
script: foo
commit 51c8987b2dd1696c27ee1235855a47bd86dfeb82
Author: radhika <radhika at curoverse.com>
Date: Thu Oct 16 16:41:21 2014 -0400
4062: test updates
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index e6cff40..11895ac 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -513,13 +513,10 @@ class ProjectsTest < ActionDispatch::IntegrationTest
unexpected_items = []
collections_count = 0
within('.arv-project-Data_collections') do
- scrollbar_present = page.execute_script("return document.documentElement.scrollHeight>document.documentElement.clientHeight;");
- if scrollbar_present
- page.execute_script "window.scrollBy(0,10000)"
- begin
- wait_for_ajax
- rescue
- end
+ page.execute_script "window.scrollBy(0,999000)"
+ begin
+ wait_for_ajax
+ rescue
end
# Visit all rows. If not all expected collections are found, retry
@@ -537,22 +534,16 @@ class ProjectsTest < ActionDispatch::IntegrationTest
end
assert_equal true, unexpected_items.empty?, "Found unexpected items #{unexpected_items.inspect}"
- if amount > 200
- assert_equal 200, collections_count, "Found different number of collections"
- assert_equal amount-200, verify_collections.length, "Did not find all the collections"
- else
- assert_equal amount, collections_count, "Found different number of collections"
- assert_equal true, verify_collections.empty?, "Did not find all the collections"
- end
+ assert_equal amount, collections_count, "Found different number of collections"
+ assert_equal true, verify_collections.empty?, "Did not find all the collections"
end
end
end
[
['project with 10 pipelines', 10, 0],
- ['project with 20 pipelines and jobs', 20, 20],
- # The following test fails for large sizes. I am thinking it is failing because of large data being sent in test env.
- ['project with 250 pipelines', 25, 0],
+ ['project with 10 jobs and 10 pipelines', 10, 10],
+ ['project with 25 pipelines', 25, 0], # 20 is the page limit for this tab; hence two pages
].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
visit page_with_token 'user1_with_load'
@@ -578,19 +569,16 @@ class ProjectsTest < ActionDispatch::IntegrationTest
unexpected_items = []
object_count = 0
within('.arv-project-Jobs_and_pipelines') do
- scrollbar_present = page.execute_script("return document.documentElement.scrollHeight>document.documentElement.clientHeight;");
- if scrollbar_present
- page.execute_script "window.scrollBy(0,10000)"
- begin
- wait_for_ajax
- rescue
- end
+ page.execute_script "window.scrollBy(0,99999999)"
+ begin
+ wait_for_ajax
+ rescue
end
# Visit all rows. Repeat if not all expected my_pipelines are found (inifinite scrolling should kick in)
pipelines_found = page.all('tr[data-kind="arvados#pipelineInstance"]')
- pipeline_count = pipelines_found.count
- (0..pipeline_count-1).each do |i|
+ found_pipeline_count = pipelines_found.count
+ (0..found_pipeline_count-1).each do |i|
name = pipelines_found[i].text.split[1]
if !my_pipelines.include? name
unexpected_items << name
@@ -600,12 +588,13 @@ class ProjectsTest < ActionDispatch::IntegrationTest
assert_equal true, unexpected_items.empty?, "Found unexpected items #{unexpected_items.inspect}"
end
- assert_equal num_pipelines, pipeline_count, "Found different number of pipelines"
- assert_equal true, verify_pipelines.empty?, "Did not find all the pipelines"
jobs_found = page.all('tr[data-kind="arvados#job"]')
- job_count = jobs_found.count
- assert_equal num_jobs, job_count, 'Did not find expected number of jobs'
+ found_job_count = jobs_found.count
+
+ assert_equal num_pipelines, found_pipeline_count, "Found different number of pipelines and jobs"
+ assert_equal num_jobs, found_job_count, 'Did not find expected number of jobs'
+ assert_equal true, verify_pipelines.empty?, "Did not find all the pipelines and jobs"
end
end
end
diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index f607f2d..345acbc 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_20_jobs_and_20_pipelines:
+project_with_10_pipelines_and_10_jobs:
uuid: zzzzz-j7d0g-20jobspipelines
owner_uuid: zzzzz-tpzed-user1withloadab
created_at: 2014-04-21 15:37:48 -0400
@@ -181,18 +181,18 @@ project_with_20_jobs_and_20_pipelines:
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 20 pipelines and jobs
+ name: project with 10 jobs and 10 pipelines
description: This will result in two pages in the display
group_class: project
-project_with_250_pipelines:
- uuid: zzzzz-j7d0g-000250pipelines
+project_with_25_pipelines:
+ uuid: zzzzz-j7d0g-000025pipelines
owner_uuid: zzzzz-tpzed-user1withloadab
created_at: 2014-04-21 15:37:48 -0400
modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
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 250 pipelines
- description: project with 250 pipelines
+ name: project with 25 pipelines
+ description: project with 25 pipelines
group_class: project
diff --git a/services/api/test/fixtures/jobs.yml b/services/api/test/fixtures/jobs.yml
index 0096aff..e6a382f 100644
--- a/services/api/test/fixtures/jobs.yml
+++ b/services/api/test/fixtures/jobs.yml
@@ -289,9 +289,9 @@ cancelled:
# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
-# jobs in project_with_20_pipelines_and_20_jobs
-<% for i in 1..20 do %>
-job_<%=i%>_of_20:
+# jobs in project_with_10_pipelines_and_10_jobs
+<% for i in 1..10 do %>
+job_<%=i%>_of_10:
uuid: zzzzz-8i9sb-0vsrcqi7whch<%= i.to_s.rjust(3, '0') %>
created_at: 2014-09-01 12:00:00
owner_uuid: zzzzz-j7d0g-20jobspipelines
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index 44d91fe..c2dbd65 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -167,9 +167,9 @@ pipeline_<%=i%>_of_10:
title: foo instance input
<% end %>
-# pipelines in project_with_20_pipelines_and_20_jobs
-<% for i in 1..20 do %>
-pipeline_<%=i%>_of_20_pipelines_and_20_jobs:
+# pipelines in project_with_10_pipelines_and_10_jobs
+<% for i in 1..10 do %>
+pipeline_<%=i%>_of_10_pipelines_and_10_jobs:
name: pipeline_<%= i %>
state: New
uuid: zzzzz-d1hrv-abcgneyn6brx<%= i.to_s.rjust(3, '0') %>
@@ -186,13 +186,13 @@ pipeline_<%=i%>_of_20_pipelines_and_20_jobs:
title: foo instance input
<% end %>
-# pipelines in project_with_250_pipelines
+# pipelines in project_with_25_pipelines
<% for i in 1..25 do %>
-pipeline_<%=i%>_of_250:
+pipeline_<%=i%>_of_25:
name: pipeline_<%=i%>
state: New
- uuid: zzzzz-d1hrv-250neyn6br1x<%= i.to_s.rjust(3, '0') %>
- owner_uuid: zzzzz-j7d0g-000250pipelines
+ uuid: zzzzz-d1hrv-25xneyn6br1x<%= i.to_s.rjust(3, '0') %>
+ owner_uuid: zzzzz-j7d0g-000025pipelines
created_at: <%= 1.minute.ago.to_s(:db) %>
components:
foo:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list