Skip to content

refactor: DRY extensions NixOS test #1906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
jfroche wants to merge 2 commits into
base: update-nixpkgs
Choose a base branch
from
Open

refactor: DRY extensions NixOS test #1906

jfroche wants to merge 2 commits into from
+478 −1,305

Conversation

@jfroche
Copy link
Collaborator

@jfroche jfroche commented Nov 11, 2025

Extract common NixOS test node configuration and functions into lib.nix to eliminate duplication across extension tests.

@jfroche jfroche requested review from a team as code owners November 11, 2025 13:19
@hunleyd
Copy link
Contributor

hunleyd commented Nov 11, 2025

there are three instances of initdb herein, the first with all the options and the 2nd two with no options. and there's two copies of pg_upgrade. would it make sense to consolidate these into lib.nix as well so there's one definition and every use becomes the same @jfroche ?

@jfroche
Copy link
Collaborator Author

jfroche commented Nov 11, 2025

there are three instances of initdb herein, the first with all the options and the 2nd two with no options. and there's two copies of pg_upgrade. would it make sense to consolidate these into lib.nix as well so there's one definition and every use becomes the same @jfroche ?

initdb is called as part of the migration script. That migration script can be different from one extension to another, that's why you can see multiple initdb (and the same for pg_upgrade).

@hunleyd
Copy link
Contributor

hunleyd commented Nov 12, 2025

there are three instances of initdb herein, the first with all the options and the 2nd two with no options. and there's two copies of pg_upgrade. would it make sense to consolidate these into lib.nix as well so there's one definition and every use becomes the same @jfroche ?

initdb is called as part of the migration script. That migration script can be different from one extension to another, that's why you can see multiple initdb (and the same for pg_upgrade).

thanks for explaining; makes sense! will review after conflicts are fixed.

@jfroche jfroche force-pushed the chore/dry-nixos-tests branch from 625cec1 to a4264ec Compare November 12, 2025 21:28
hunleyd
hunleyd approved these changes Nov 13, 2025
View reviewed changes
Copy link
Contributor

@hunleyd hunleyd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks sane to me

@jfroche jfroche force-pushed the chore/dry-nixos-tests branch from a4264ec to 4800989 Compare December 12, 2025 17:38
@jfroche
refactor: DRY NixOS test configurations
8e9ed1f 
Extract common NixOS test node configuration into common.nix to eliminate
duplication across extension tests.

Tests with custom requirements use lib.mkMerge to override defaults.
This helps us to see at a glance why a test deviates from the standard
setup.
@jfroche
refactor: move more generic functions to test lib
89485d9 
Move `postgresqlWithExtension` and `versions` to the test lib to reduce
code duplication across extension tests.
@jfroche jfroche force-pushed the chore/dry-nixos-tests branch from 4800989 to 89485d9 Compare December 16, 2025 15:55
@jfroche jfroche requested a review from a team as a code owner December 16, 2025 15:55
@jfroche jfroche changed the base branch from develop to update-nixpkgs December 16, 2025 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hunleyd hunleyd hunleyd approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jfroche @hunleyd