From 9ba7ce51e223433f265b1673fd308838c7bfe93d Mon Sep 17 00:00:00 2001 From: Hrishikesh Barman Date: Mon, 15 Apr 2024 16:08:20 +0530 Subject: [PATCH 1/2] goose: update test skip list with newer tests fixes #302629 After updating from `3.15.0 -> 3.19.2` build for `goose` was failing. This was due to the tests failing esp on integration tests which required the docker darmon to be running. Tests with similar nature were already skipped, but on the upgraded version newer integration tests were added. This change adds these changes to the test skip list aswell. Skip following tests which require a docker daemon to be running - TestLockModeAdvisorySession - TestDialectStore - TestGoMigrationStats - TestPostgresSessionLocker Links: - Commit adding the new integration tests: https://github.com/pressly/goose/commit/b2c483ada4b3450f4b95396455aaae33c42d2b78 --- pkgs/tools/misc/goose/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goose/default.nix b/pkgs/tools/misc/goose/default.nix index b80efbaccd39a..4113e539dc1e5 100644 --- a/pkgs/tools/misc/goose/default.nix +++ b/pkgs/tools/misc/goose/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { proxyVendor = true; vendorHash = "sha256-aoBxReKRk7dkFR/fJ5uHDZrJRGutLTU2BhDWCTBN2BA="; - # end-to-end tests require a docker daemon + # skipping: end-to-end tests require a docker daemon postPatch = '' rm -r tests/e2e rm -r tests/gomigrations @@ -32,8 +32,10 @@ buildGoModule rec { ]; checkFlags = [ - # these also require a docker daemon - "-skip=TestClickUpDown|TestClickHouseFirstThree" + # NOTE: + # - skipping: these also require a docker daemon + # - these are for go tests that live outside of the /tests directory + "-skip=TestClickUpDown|TestClickHouseFirstThree|TestLockModeAdvisorySession|TestDialectStore|TestGoMigrationStats|TestPostgresSessionLocker" ]; doCheck = !stdenv.isDarwin; @@ -46,3 +48,5 @@ buildGoModule rec { mainProgram = "goose"; }; } + + From 43487d0f4b75e94fdb7a6da6083d4a7fc2655c53 Mon Sep 17 00:00:00 2001 From: Hrishikesh Barman Date: Mon, 15 Apr 2024 16:20:11 +0530 Subject: [PATCH 2/2] fixup! goose: update test skip list with newer tests --- pkgs/tools/misc/goose/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/misc/goose/default.nix b/pkgs/tools/misc/goose/default.nix index 4113e539dc1e5..aec189dc528c0 100644 --- a/pkgs/tools/misc/goose/default.nix +++ b/pkgs/tools/misc/goose/default.nix @@ -48,5 +48,3 @@ buildGoModule rec { mainProgram = "goose"; }; } - -