From 608d73e91b78c50c264cd7a6ecd67200d5610d51 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Thu, 1 Jul 2021 21:24:45 -0400 Subject: [PATCH] Fix api server tests. refs #17817 Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- services/api/test/fixtures/jobs.yml | 2 +- .../api/test/fixtures/pipeline_instances.yml | 64 +++++++++---------- .../api/test/fixtures/pipeline_templates.yml | 30 ++++----- services/api/test/helpers/git_test_helper.rb | 6 +- services/api/test/unit/commit_test.rb | 14 ++-- services/api/test/unit/job_test.rb | 2 +- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/services/api/test/fixtures/jobs.yml b/services/api/test/fixtures/jobs.yml index 140f370839..9b067aa263 100644 --- a/services/api/test/fixtures/jobs.yml +++ b/services/api/test/fixtures/jobs.yml @@ -496,7 +496,7 @@ job_with_latest_version: script: hash repository: active/foo script_version: 7def43a4d3f20789dda4700f703b5514cc3ed250 - supplied_script_version: master + supplied_script_version: main script_parameters: input: 1f4b0bc7583c2a7f9102c395f4ffc5e3+45 created_at: <%= 3.minute.ago.to_s(:db) %> diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml index 013f03c47e..0865503281 100644 --- a/services/api/test/fixtures/pipeline_instances.yml +++ b/services/api/test/fixtures/pipeline_instances.yml @@ -22,7 +22,7 @@ has_component_with_no_script_parameters: components: foo: script: foo - script_version: master + script_version: main script_parameters: {} has_component_with_empty_script_parameters: @@ -33,7 +33,7 @@ has_component_with_empty_script_parameters: components: foo: script: foo - script_version: master + script_version: main has_component_with_completed_jobs: # Test that the job "started_at" and "finished_at" fields are parsed @@ -52,11 +52,11 @@ has_component_with_completed_jobs: components: foo: script: foo - script_version: master + script_version: main script_parameters: {} job: uuid: zzzzz-8i9sb-rft1xdewxkwgxnz - script_version: master + script_version: main created_at: <%= 10.minute.ago.to_s(:db) %> started_at: <%= 10.minute.ago.to_s(:db) %> finished_at: <%= 9.minute.ago.to_s(:db) %> @@ -68,11 +68,11 @@ has_component_with_completed_jobs: done: 1 bar: script: bar - script_version: master + script_version: main script_parameters: {} job: uuid: zzzzz-8i9sb-r2dtbzr6bfread7 - script_version: master + script_version: main created_at: <%= 9.minute.ago.to_s(:db) %> started_at: <%= 9.minute.ago.to_s(:db) %> state: Running @@ -83,11 +83,11 @@ has_component_with_completed_jobs: done: 3 baz: script: baz - script_version: master + script_version: main script_parameters: {} job: uuid: zzzzz-8i9sb-c7408rni11o7r6s - script_version: master + script_version: main created_at: <%= 9.minute.ago.to_s(:db) %> state: Queued tasks_summary: {} @@ -101,11 +101,11 @@ has_job: components: foo: script: foo - script_version: master + script_version: main script_parameters: {} job: { uuid: zzzzz-8i9sb-pshmckwoma9plh7, - script_version: master + script_version: main } components_is_jobspec: @@ -122,7 +122,7 @@ components_is_jobspec: state: RunningOnServer components: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -184,7 +184,7 @@ pipeline_with_newer_template: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -201,7 +201,7 @@ pipeline_instance_owned_by_fuse: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -218,7 +218,7 @@ pipeline_instance_in_fuse_project: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -234,7 +234,7 @@ pipeline_owned_by_active_in_aproject: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -250,7 +250,7 @@ pipeline_owned_by_active_in_home: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -267,7 +267,7 @@ pipeline_in_publicly_accessible_project: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -277,7 +277,7 @@ pipeline_in_publicly_accessible_project: uuid: zzzzz-8i9sb-jyq01m7in1jlofj repository: active/foo script: foo - script_version: master + script_version: main script_parameters: input: zzzzz-4zz18-4en62shvi99lxd4 log: zzzzz-4zz18-4en62shvi99lxd4 @@ -294,7 +294,7 @@ pipeline_in_publicly_accessible_project_but_other_objects_elsewhere: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -304,7 +304,7 @@ pipeline_in_publicly_accessible_project_but_other_objects_elsewhere: uuid: zzzzz-8i9sb-aceg2bnq7jt7kon repository: active/foo script: foo - script_version: master + script_version: main script_parameters: input: zzzzz-4zz18-bv31uwvy3neko21 log: zzzzz-4zz18-bv31uwvy3neko21 @@ -321,7 +321,7 @@ new_pipeline_in_publicly_accessible_project: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -338,7 +338,7 @@ new_pipeline_in_publicly_accessible_project_but_other_objects_elsewhere: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -355,7 +355,7 @@ new_pipeline_in_publicly_accessible_project_with_dataclass_file_and_other_object components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -372,11 +372,11 @@ pipeline_in_running_state: components: foo: script: foo - script_version: master + script_version: main script_parameters: {} job: uuid: zzzzz-8i9sb-pshmckwoma9plh7 - script_version: master + script_version: main running_pipeline_with_complete_job: uuid: zzzzz-d1hrv-partdonepipelin @@ -434,11 +434,11 @@ job_child_pipeline_with_components_at_level_2: components: foo: script: foo - script_version: master + script_version: main script_parameters: {} job: uuid: zzzzz-8i9sb-job1atlevel3noc - script_version: master + script_version: main created_at: <%= 12.hour.ago.to_s(:db) %> started_at: <%= 12.hour.ago.to_s(:db) %> state: Running @@ -449,11 +449,11 @@ job_child_pipeline_with_components_at_level_2: done: 1 bar: script: bar - script_version: master + script_version: main script_parameters: {} job: uuid: zzzzz-8i9sb-job2atlevel3noc - script_version: master + script_version: main created_at: <%= 12.hour.ago.to_s(:db) %> started_at: <%= 12.hour.ago.to_s(:db) %> state: Running @@ -480,7 +480,7 @@ pipeline_<%=i%>_of_10: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -501,7 +501,7 @@ pipeline_<%=i%>_of_2_pipelines_and_60_crs: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -522,7 +522,7 @@ pipeline_<%=i%>_of_25: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true diff --git a/services/api/test/fixtures/pipeline_templates.yml b/services/api/test/fixtures/pipeline_templates.yml index 69f8f825d6..0c185eeb80 100644 --- a/services/api/test/fixtures/pipeline_templates.yml +++ b/services/api/test/fixtures/pipeline_templates.yml @@ -14,7 +14,7 @@ two_part: components: part-one: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -22,7 +22,7 @@ two_part: title: "Foo/bar pair" part-two: script: bar - script_version: master + script_version: main script_parameters: input: output_of: part-one @@ -53,7 +53,7 @@ components_is_jobspec: name: Pipeline Template with Jobspec Components components: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -73,7 +73,7 @@ parameter_with_search: components: with-search: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -95,7 +95,7 @@ new_pipeline_template: components: foo: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -103,7 +103,7 @@ new_pipeline_template: title: foo template input bar: script: bar - script_version: master + script_version: main script_parameters: input: required: true @@ -122,7 +122,7 @@ pipeline_template_in_fuse_project: components: foo_component: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -142,7 +142,7 @@ template_with_dataclass_file: components: part-one: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -151,7 +151,7 @@ template_with_dataclass_file: description: "Provide an input file" part-two: script: bar - script_version: master + script_version: main script_parameters: input: output_of: part-one @@ -181,7 +181,7 @@ template_with_dataclass_number: components: work: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -200,7 +200,7 @@ pipeline_template_in_publicly_accessible_project: components: foo_component: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -221,7 +221,7 @@ template_in_active_user_home_project_to_test_unique_key_violation: name: Template to test owner uuid and name unique key violation upon removal components: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -240,7 +240,7 @@ template_in_asubproject_with_same_name_as_one_in_active_user_home: name: Template to test owner uuid and name unique key violation upon removal components: script: foo - script_version: master + script_version: main script_parameters: input: required: true @@ -260,7 +260,7 @@ workflow_with_input_defaults: components: part-one: script: foo - script_version: master + script_version: main script_parameters: ex_string: required: true @@ -268,4 +268,4 @@ workflow_with_input_defaults: ex_string_def: required: true dataclass: string - default: hello-testing-123 \ No newline at end of file + default: hello-testing-123 diff --git a/services/api/test/helpers/git_test_helper.rb b/services/api/test/helpers/git_test_helper.rb index 59debc5760..cb30f68015 100644 --- a/services/api/test/helpers/git_test_helper.rb +++ b/services/api/test/helpers/git_test_helper.rb @@ -6,12 +6,12 @@ require 'fileutils' require 'tmpdir' # Commit log for "foo" repository in test.git.tar -# master is the main branch -# b1 is a branch off of master +# main is the main branch +# b1 is a branch off of main # tag1 is a tag # # 1de84a8 * b1 -# 077ba2a * master +# 077ba2a * main # 4fe459a * tag1 # 31ce37f * foo diff --git a/services/api/test/unit/commit_test.rb b/services/api/test/unit/commit_test.rb index 1c04abf364..e83061f61a 100644 --- a/services/api/test/unit/commit_test.rb +++ b/services/api/test/unit/commit_test.rb @@ -22,7 +22,7 @@ class CommitTest < ActiveSupport::TestCase test 'find_commit_range does not bypass permissions' do authorize_with :inactive assert_raises ArgumentError do - CommitsHelper::find_commit_range 'foo', nil, 'master', [] + CommitsHelper::find_commit_range 'foo', nil, 'main', [] end end @@ -43,7 +43,7 @@ class CommitTest < ActiveSupport::TestCase fake_gitdir = repositories(:foo).server_path CommitsHelper::expects(:cache_dir_for).once.with(url).returns fake_gitdir CommitsHelper::expects(:fetch_remote_repository).once.with(fake_gitdir, url).returns true - c = CommitsHelper::find_commit_range url, nil, 'master', [] + c = CommitsHelper::find_commit_range url, nil, 'main', [] refute_empty c end end @@ -59,7 +59,7 @@ class CommitTest < ActiveSupport::TestCase test "find_commit_range skips fetch_remote_repository for #{url}" do CommitsHelper::expects(:fetch_remote_repository).never assert_raises ArgumentError do - CommitsHelper::find_commit_range url, nil, 'master', [] + CommitsHelper::find_commit_range url, nil, 'main', [] end end end @@ -67,7 +67,7 @@ class CommitTest < ActiveSupport::TestCase test 'fetch_remote_repository does not leak commits across repositories' do url = "http://localhost:1/fake/fake.git" fetch_remote_from_local_repo url, :foo - c = CommitsHelper::find_commit_range url, nil, 'master', [] + c = CommitsHelper::find_commit_range url, nil, 'main', [] assert_equal ['077ba2ad3ea24a929091a9e6ce545c93199b8e57'], c url = "http://localhost:2/fake/fake.git" @@ -89,7 +89,7 @@ class CommitTest < ActiveSupport::TestCase def with_foo_repository Dir.chdir("#{Rails.configuration.Git.Repositories}/#{repositories(:foo).uuid}") do - must_pipe("git checkout master 2>&1") + must_pipe("git checkout main 2>&1") yield end end @@ -196,7 +196,7 @@ class CommitTest < ActiveSupport::TestCase assert_equal ['31ce37fe365b3dc204300a3e4c396ad333ed0556'], a #test "test_branch1" do - a = CommitsHelper::find_commit_range('active/foo', nil, 'master', nil) + a = CommitsHelper::find_commit_range('active/foo', nil, 'main', nil) assert_includes(a, '077ba2ad3ea24a929091a9e6ce545c93199b8e57') #test "test_branch2" do @@ -221,7 +221,7 @@ class CommitTest < ActiveSupport::TestCase #test "test_tag" do # complains "fatal: ambiguous argument 'tag1': unknown revision or path # not in the working tree." - a = CommitsHelper::find_commit_range('active/foo', 'tag1', 'master', nil) + a = CommitsHelper::find_commit_range('active/foo', 'tag1', 'main', nil) assert_equal ['077ba2ad3ea24a929091a9e6ce545c93199b8e57', '4fe459abe02d9b365932b8f5dc419439ab4e2577'], a #test "test_multi_revision_exclude" do diff --git a/services/api/test/unit/job_test.rb b/services/api/test/unit/job_test.rb index c529aab8b6..815079f8af 100644 --- a/services/api/test/unit/job_test.rb +++ b/services/api/test/unit/job_test.rb @@ -20,7 +20,7 @@ class JobTest < ActiveSupport::TestCase # Default (valid) set of attributes, with given overrides { script: "hash", - script_version: "master", + script_version: "main", repository: "active/foo", }.merge(merge_me) end -- 2.30.2