tests: Introduce a way to disable options when running in tests (#1095)

In our basic template we used to provide a check based on
`mkTestDerivationFromNvim`. The issue with this check (that is handled
correctly internally) is that some plugins _can't_ be used in the test
environment, for example image.nvim like in #1085.

This commit introduces a new function to generate such checks,
`mkTestDerivationFromNixvimModule`, that wraps a nixvim configuration
instead of a built nvim instance.

Then a configuration can rely on the newly added
`helpers.enableExceptInTests` attribute to disable parts of the
configuration depending if it is evaluated in tests or in a real final
configuration.

Resolves #1085
This commit is contained in:
traxys 2024-02-15 14:27:45 +01:00 committed by GitHub
parent 0cef34c889
commit 6d7e429537
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 92 additions and 20 deletions

View file

@ -37,3 +37,6 @@ A certain number of helpers are defined that can be useful:
```lua ```lua
{"a", "b", [foo] = "bar"} {"a", "b", [foo] = "bar"}
``` ```
- `helpers.enableExceptInTests`: Evaluates to `true`, except in `mkTestDerivationFromNixvimModule`
where it evaluates to `false`. This allows to skip instantiating plugins that can't be run in tests.

View file

@ -1,7 +1,7 @@
{getHelpers, ...}: { {getHelpers, ...}: {
_module.args.getHelpers = pkgs: _module.args.getHelpers = pkgs: _nixvimTests:
import ../lib/helpers.nix { import ../lib/helpers.nix {
inherit pkgs; inherit pkgs _nixvimTests;
inherit (pkgs) lib; inherit (pkgs) lib;
}; };
@ -10,6 +10,6 @@
config, config,
... ...
}: { }: {
_module.args.helpers = getHelpers pkgs; _module.args.helpers = getHelpers pkgs false;
}; };
} }

View file

@ -13,7 +13,7 @@
}: }:
import ../lib { import ../lib {
inherit pkgs lib; inherit pkgs lib;
inherit (config.legacyPackages) makeNixvim; inherit (config.legacyPackages) makeNixvim makeNixvimWithModule;
} }
) )
); );

View file

@ -1,4 +1,4 @@
{ {self, ...}: {
perSystem = { perSystem = {
pkgs, pkgs,
config, config,
@ -10,7 +10,7 @@
}: { }: {
checks = { checks = {
tests = import ../tests { tests = import ../tests {
inherit pkgs helpers; inherit pkgs helpers makeNixvimWithModule;
inherit (pkgs) lib; inherit (pkgs) lib;
makeNixvim = configuration: makeNixvim = configuration:
makeNixvimWithModuleUnfree { makeNixvimWithModuleUnfree {
@ -25,6 +25,11 @@
inherit makeNixvimWithModule; inherit makeNixvimWithModule;
}; };
enable-except-in-tests = import ../tests/enable-except-in-tests.nix {
inherit pkgs makeNixvimWithModule;
inherit (self.lib.${system}.check) mkTestDerivationFromNixvimModule;
};
lib-tests = import ../tests/lib-tests.nix { lib-tests = import ../tests/lib-tests.nix {
inherit pkgs helpers; inherit pkgs helpers;
inherit (pkgs) lib; inherit (pkgs) lib;

View file

@ -1,12 +1,13 @@
# Args probably only needs pkgs and lib # Args probably only needs pkgs and lib
{ {
makeNixvim, makeNixvim,
makeNixvimWithModule,
pkgs, pkgs,
... ...
} @ args: { } @ args: {
# Add all exported modules here # Add all exported modules here
check = import ../tests/test-derivation.nix { check = import ../tests/test-derivation.nix {
inherit makeNixvim pkgs; inherit makeNixvim makeNixvimWithModule pkgs;
}; };
helpers = import ./helpers.nix args; helpers = import ./helpers.nix args;
} }

View file

@ -1,10 +1,11 @@
{ {
lib, lib,
pkgs, pkgs,
_nixvimTests,
... ...
}: let }: let
nixvimTypes = import ./types.nix {inherit lib nixvimOptions;}; nixvimTypes = import ./types.nix {inherit lib nixvimOptions;};
nixvimUtils = import ./utils.nix {inherit lib;}; nixvimUtils = import ./utils.nix {inherit lib _nixvimTests;};
nixvimOptions = import ./options.nix {inherit lib nixvimTypes nixvimUtils;}; nixvimOptions = import ./options.nix {inherit lib nixvimTypes nixvimUtils;};
inherit (import ./to-lua.nix {inherit lib;}) toLuaObject; inherit (import ./to-lua.nix {inherit lib;}) toLuaObject;
in in

View file

@ -1,9 +1,14 @@
{lib}: {
lib,
_nixvimTests,
}:
with lib; { with lib; {
listToUnkeyedAttrs = list: listToUnkeyedAttrs = list:
builtins.listToAttrs builtins.listToAttrs
(lib.lists.imap0 (idx: lib.nameValuePair "__unkeyed-${toString idx}") list); (lib.lists.imap0 (idx: lib.nameValuePair "__unkeyed-${toString idx}") list);
enableExceptInTests = !_nixvimTests;
emptyTable = {"__empty" = null;}; emptyTable = {"__empty" = null;};
/* /*

View file

@ -29,7 +29,7 @@
}: let }: let
nixvimLib = nixvim.lib.${system}; nixvimLib = nixvim.lib.${system};
nixvim' = nixvim.legacyPackages.${system}; nixvim' = nixvim.legacyPackages.${system};
nvim = nixvim'.makeNixvimWithModule { nixvimModule = {
inherit pkgs; inherit pkgs;
module = config; module = config;
# You can use `extraSpecialArgs` to pass additional arguments to your module files # You can use `extraSpecialArgs` to pass additional arguments to your module files
@ -37,13 +37,11 @@
# inherit (inputs) foo; # inherit (inputs) foo;
}; };
}; };
nvim = nixvim'.makeNixvimWithModule nixvimModule;
in { in {
checks = { checks = {
# Run `nix flake check .` to verify that your config is not broken # Run `nix flake check .` to verify that your config is not broken
default = nixvimLib.check.mkTestDerivationFromNvim { default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
inherit nvim;
name = "A nixvim configuration";
};
}; };
packages = { packages = {

View file

@ -1,11 +1,12 @@
{ {
makeNixvim, makeNixvim,
makeNixvimWithModule,
lib, lib,
helpers, helpers,
pkgs, pkgs,
}: let }: let
fetchTests = import ./fetch-tests.nix; fetchTests = import ./fetch-tests.nix;
test-derivation = import ./test-derivation.nix {inherit pkgs makeNixvim;}; test-derivation = import ./test-derivation.nix {inherit pkgs makeNixvim makeNixvimWithModule;};
inherit (test-derivation) mkTestDerivation; inherit (test-derivation) mkTestDerivation;
# List of files containing configurations # List of files containing configurations

View file

@ -0,0 +1,41 @@
{
pkgs,
mkTestDerivationFromNixvimModule,
makeNixvimWithModule,
}: let
module = {helpers, ...}: {
plugins.image.enable = helpers.enableExceptInTests;
};
inTest = mkTestDerivationFromNixvimModule {
name = "enable-except-in-tests-test";
inherit pkgs module;
};
notInTest = let
nvim = makeNixvimWithModule {
inherit pkgs module;
};
in
pkgs.runCommand "enable-except-in-tests-not-in-test" {
printConfig = "${nvim}/bin/nixvim-print-init";
} ''
if ! "$printConfig" | grep 'require("image").setup'; then
echo "image.nvim is not present in the configuration"
echo -e "configuration:\n$($printConfig)"
exit 1
fi
touch $out
'';
in
pkgs.linkFarm "enable-except-in-tests" [
{
name = "in-test";
path = inTest;
}
{
name = "not-in-test";
path = notInTest;
}
]

View file

@ -1,6 +1,7 @@
{ {
pkgs, pkgs,
makeNixvim, makeNixvim,
makeNixvimWithModule,
}: let }: let
# Create a nix derivation from a nixvim executable. # Create a nix derivation from a nixvim executable.
# The build phase simply consists in running the provided nvim binary. # The build phase simply consists in running the provided nvim binary.
@ -40,6 +41,21 @@
''; '';
}; };
mkTestDerivationFromNixvimModule = {
name ? "nixvim-check",
pkgs,
module,
extraSpecialArgs ? {},
}: let
nvim = makeNixvimWithModule {
inherit pkgs module extraSpecialArgs;
_nixvimTests = true;
};
in
mkTestDerivationFromNvim {
inherit name nvim;
};
# Create a nix derivation from a nixvim configuration. # Create a nix derivation from a nixvim configuration.
# The build phase simply consists in running neovim with the given configuration. # The build phase simply consists in running neovim with the given configuration.
mkTestDerivation = name: config: let mkTestDerivation = name: config: let
@ -56,5 +72,5 @@
inherit (testAttributes) dontRun; inherit (testAttributes) dontRun;
}; };
in { in {
inherit mkTestDerivation mkTestDerivationFromNvim; inherit mkTestDerivation mkTestDerivationFromNvim mkTestDerivationFromNixvimModule;
} }

View file

@ -9,7 +9,7 @@
... ...
} @ args: let } @ args: let
inherit (lib) mkEnableOption mkOption mkOptionType mkForce mkMerge mkIf types; inherit (lib) mkEnableOption mkOption mkOptionType mkForce mkMerge mkIf types;
helpers = getHelpers pkgs; helpers = getHelpers pkgs false;
shared = import ./_shared.nix {inherit modules helpers;} args; shared = import ./_shared.nix {inherit modules helpers;} args;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
in { in {

View file

@ -9,7 +9,7 @@
... ...
} @ args: let } @ args: let
inherit (lib) mkEnableOption mkOption mkOptionType mkMerge mkIf types; inherit (lib) mkEnableOption mkOption mkOptionType mkMerge mkIf types;
helpers = getHelpers pkgs; helpers = getHelpers pkgs false;
shared = import ./_shared.nix {inherit modules helpers;} args; shared = import ./_shared.nix {inherit modules helpers;} args;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
files = files =

View file

@ -9,7 +9,7 @@
... ...
} @ args: let } @ args: let
inherit (lib) mkEnableOption mkOption mkOptionType mkForce mkMerge mkIf types; inherit (lib) mkEnableOption mkOption mkOptionType mkForce mkMerge mkIf types;
helpers = getHelpers pkgs; helpers = getHelpers pkgs false;
shared = import ./_shared.nix {inherit modules helpers;} args; shared = import ./_shared.nix {inherit modules helpers;} args;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
files = files =

View file

@ -5,11 +5,12 @@ default_pkgs: {
}: { }: {
pkgs ? default_pkgs, pkgs ? default_pkgs,
extraSpecialArgs ? {}, extraSpecialArgs ? {},
_nixvimTests ? false,
module, module,
}: let }: let
inherit (pkgs) lib; inherit (pkgs) lib;
helpers = getHelpers pkgs; helpers = getHelpers pkgs _nixvimTests;
shared = import ./_shared.nix {inherit modules helpers;} { shared = import ./_shared.nix {inherit modules helpers;} {
inherit pkgs lib; inherit pkgs lib;
config = {}; config = {};