fricklerhandwerk/clan-core
1
0
Fork 0
forked from clan/clan-core
Code Pull Requests Activity

Fix schema test

Browse Source
This commit is contained in:
Johannes Kirschbauer 2024-07-14 13:52:21 +02:00
parent 7bbe63a525
commit ad321976ff
Signed by: hsjobeki
SSH Key Fingerprint: SHA256:vX3utDqig7Ph5L0JPv87ZTPb/w7cMzREKVZzzLFg9qU
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/inventory/flake-module.nix
View File

@ -107,7 +107,6 @@ in
devShells.inventory-schema = pkgs.mkShell {
inputsFrom = with config.checks; [
lib-inventory-examples-cue
lib-inventory-schema
lib-inventory-eval
self'.devShells.default
];

2
lib/jsonschema/test.nix
View File

@ -1,7 +1,7 @@
# run these tests via `nix-unit ./test.nix`
{
lib ? (import <nixpkgs> { }).lib,
slib ? import ./. { inherit lib; },
slib ? (import ./. { inherit lib; } { }),
}:
{
parseOption = import ./test_parseOption.nix { inherit lib slib; };

10
lib/jsonschema/test_parseOption.nix
View File

@ -2,7 +2,7 @@
# run these tests via `nix-unit ./test.nix`
{
lib ? (import <nixpkgs> { }).lib,
slib ? import ./. { inherit lib; },
slib ? (import ./. { inherit lib; } { }),
}:
let
description = "Test Description";
@ -236,7 +236,7 @@ in
{
expr = slib.parseOption (evalType (lib.types.nullOr lib.types.bool) default);
expected = {
anyOf = [
oneOf = [
{ type = "null"; }
{ type = "boolean"; }
];
@ -251,10 +251,10 @@ in
{
expr = slib.parseOption (evalType (lib.types.nullOr (lib.types.nullOr lib.types.bool)) default);
expected = {
anyOf = [
oneOf = [
{ type = "null"; }
{
anyOf = [
oneOf = [
{ type = "null"; }
{ type = "boolean"; }
];
@ -386,7 +386,7 @@ in
{
expr = slib.parseOption (evalType (lib.types.either lib.types.bool lib.types.str) default);
expected = {
anyOf = [
oneOf = [
{ type = "boolean"; }
{ type = "string"; }
];

2
lib/jsonschema/test_parseOptions.nix
View File

@ -2,7 +2,7 @@
# run these tests via `nix-unit ./test.nix`
{
lib ? (import <nixpkgs> { }).lib,
slib ? import ./. { inherit lib; },
slib ? (import ./. { inherit lib; } { }),
}:
{
testParseOptions = {

2
pkgs/clan-cli/clan_cli/config/schema.py
View File

@ -95,7 +95,7 @@ def machine_schema(
}};
options = fakeMachine.options{"." + ".".join(option_path) if option_path else ""};
jsonschemaLib = import {Path(__file__).parent / "jsonschema"} {{ inherit lib; }} {{}};
jsonschema = jsonschemaLib.parseOptions options;
jsonschema = jsonschemaLib.parseOptions options {{}};
in
jsonschema
""",