From 7f27913c6ddbe3c820306b613ff5eb57be982553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 4 Oct 2023 09:28:43 +0200 Subject: [PATCH 1/2] Make updater spec pass consistently on aarch64-linux Otherwise it fails due to some extra lockfile changes. --- updater/spec/fixtures/bundler_vendored/original/Gemfile.lock | 4 +++- updater/spec/fixtures/bundler_vendored/updated/Gemfile.lock | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/updater/spec/fixtures/bundler_vendored/original/Gemfile.lock b/updater/spec/fixtures/bundler_vendored/original/Gemfile.lock index 190b6d9545..aa12c3dfc3 100644 --- a/updater/spec/fixtures/bundler_vendored/original/Gemfile.lock +++ b/updater/spec/fixtures/bundler_vendored/original/Gemfile.lock @@ -13,7 +13,9 @@ GEM dummy-pkg-a (~> 2.0) PLATFORMS - x86_64-darwin-22 + aarch64-linux + x86_64-darwin + x86_64-linux DEPENDENCIES dummy-git-dependency! diff --git a/updater/spec/fixtures/bundler_vendored/updated/Gemfile.lock b/updater/spec/fixtures/bundler_vendored/updated/Gemfile.lock index e118c1de04..f2fa64247a 100644 --- a/updater/spec/fixtures/bundler_vendored/updated/Gemfile.lock +++ b/updater/spec/fixtures/bundler_vendored/updated/Gemfile.lock @@ -13,7 +13,8 @@ GEM dummy-pkg-a (~> 2.0) PLATFORMS - x86_64-darwin-22 + aarch64-linux + x86_64-darwin x86_64-linux DEPENDENCIES From 88fcab71c9b9fac9ba910b7d2c502b77c3db2be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Wed, 4 Oct 2023 09:40:27 +0200 Subject: [PATCH 2/2] Fix flaky test failures Recently the job JSON file was changed to include an experiment, so needs to be reset. --- updater/spec/dependabot/file_fetcher_command_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/updater/spec/dependabot/file_fetcher_command_spec.rb b/updater/spec/dependabot/file_fetcher_command_spec.rb index 41143a2f75..585325244d 100644 --- a/updater/spec/dependabot/file_fetcher_command_spec.rb +++ b/updater/spec/dependabot/file_fetcher_command_spec.rb @@ -31,6 +31,11 @@ JSON.parse(fixture("jobs/job_with_credentials.json")) end + after do + # The job definition in this context loads an experiment, so reset it + Dependabot::Experiments.reset! + end + it "fetches the files and writes the fetched files to output.json", vcr: true do expect(api_client).not_to receive(:mark_job_as_processed)