From 15122130f9e66ad20d377bce57a59b93f908560a Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Wed, 29 Mar 2023 14:35:00 +0200 Subject: [PATCH] remove schemathesis test --- README.md | 4 --- devShells.nix | 1 - flake.lock | 62 +++++++------------------------------ flake.nix | 6 ---- packages/cicero/default.nix | 13 -------- packages/schemathesis.nix | 17 ---------- 6 files changed, 12 insertions(+), 91 deletions(-) delete mode 100644 packages/schemathesis.nix diff --git a/README.md b/README.md index a2ac448d..e6dddd03 100644 --- a/README.md +++ b/README.md @@ -35,10 +35,6 @@ Run tests with coverage: go test -cover ./... -Run OpenAPI validation tests: - - schemathesis run http://localhost:18080/documentation/cicero.yaml --validate-schema=false - Serve the handbook locally on port 3000 and open it: mdbook serve --open diff --git a/devShells.nix b/devShells.nix index 6b273ae9..868f22ec 100644 --- a/devShells.nix +++ b/devShells.nix @@ -69,7 +69,6 @@ commands = [ {package = "dbmate";} - {package = config.packages.schemathesis;} {package = "nomad";} {package = "vault";} {package = "damon";} diff --git a/flake.lock b/flake.lock index 54921afa..0df713f9 100644 --- a/flake.lock +++ b/flake.lock @@ -148,7 +148,7 @@ "nix": "nix_3", "nix-cache-proxy": "nix-cache-proxy", "nixpkgs": "nixpkgs_8", - "poetry2nix": "poetry2nix_2", + "poetry2nix": "poetry2nix", "utils": "utils_6" }, "locked": { @@ -221,7 +221,7 @@ }, "devshell_3": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -410,21 +410,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -439,7 +424,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -454,7 +439,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "locked": { "lastModified": 1610051610, "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", @@ -469,7 +454,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -484,7 +469,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -499,7 +484,7 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -653,7 +638,7 @@ "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": "hackage", "hpc-coveralls": "hpc-coveralls", @@ -867,7 +852,7 @@ }, "n2c": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_9" }, "locked": { @@ -1008,7 +993,7 @@ }, "nix2container": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_11" }, "locked": { @@ -1525,29 +1510,7 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1657626303, - "narHash": "sha256-O/JJ0hSBCmlx0oP8QGAlRrWn0BvlC5cj7/EZ0CCWHTU=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "920ba682377d5c0d87945c5eb6141ab8447ca509", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "920ba682377d5c0d87945c5eb6141ab8447ca509", - "type": "github" - } - }, - "poetry2nix_2": { - "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "spongix", "cicero", @@ -1583,7 +1546,6 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nomad": "nomad", "parts": "parts", - "poetry2nix": "poetry2nix", "spongix": "spongix", "treefmt-nix": "treefmt-nix", "tullia": "tullia" @@ -1644,7 +1606,7 @@ "blank": "blank", "devshell": "devshell_8", "dmerge": "dmerge", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "incl": "incl", "makes": [ "tullia", diff --git a/flake.nix b/flake.nix index 8eafa873..4534d7a8 100644 --- a/flake.nix +++ b/flake.nix @@ -26,11 +26,6 @@ url = github:input-output-hk/nomad-follower; inputs.nixpkgs.follows = "nixpkgs"; }; - poetry2nix = { - # FIXME try building .#schemathesis when you unpin this - url = github:nix-community/poetry2nix/920ba682377d5c0d87945c5eb6141ab8447ca509; - inputs.nixpkgs.follows = "nixpkgs"; - }; spongix = { # tests fail on latest main url = github:input-output-hk/spongix/a08bcc8f0bb63e372bf82abe5ad1f001e6b4d566; @@ -60,7 +55,6 @@ packages/cicero/evaluators/nix packages/cicero/handbook.nix packages/trigger.nix - packages/schemathesis.nix packages/nomad-driver-podman.nix packages/go-critic.nix packages/treefmt-cue.nix diff --git a/packages/cicero/default.nix b/packages/cicero/default.nix index e715a999..23339ce4 100644 --- a/packages/cicero/default.nix +++ b/packages/cicero/default.nix @@ -45,7 +45,6 @@ in with lib.systems.inspect.predicates; ifSystem isLinux { - schemathesis = schemathesisTest; api = apiTest; }; }; @@ -78,18 +77,6 @@ systemd.services.postgresql.serviceConfig.TimeoutStartSec = 300; }; - schemathesisTest = pkgs.nixosTest { - name = "schemathesis"; - nodes.main = { - imports = [nixosTestNode]; - environment.systemPackages = [perSystem.config.packages.schemathesis]; - }; - testScript = '' - main.wait_for_unit("cicero") - main.succeed("schemathesis run http://127.0.0.1:8080/documentation/cicero.json --validate-schema=false --hypothesis-suppress-health-check=too_slow") - ''; - }; - apiTest = let src = inputs.inclusive.lib.inclusive ../.. [ ../../flake.nix diff --git a/packages/schemathesis.nix b/packages/schemathesis.nix deleted file mode 100644 index 0a6db6b2..00000000 --- a/packages/schemathesis.nix +++ /dev/null @@ -1,17 +0,0 @@ -{inputs, ...}: { - perSystem = {system, ...}: { - packages.schemathesis = let - nixpkgs = __getFlake github:NixOS/nixpkgs/294ef54a1e8cdcdd298c79edbdb3713ceae46988; - pkgs = nixpkgs.legacyPackages.${system}.extend inputs.poetry2nix.overlay; - in - pkgs.poetry2nix.mkPoetryApplication { - projectDir = pkgs.fetchFromGitHub { - owner = "schemathesis"; - repo = "schemathesis"; - rev = "v3.12.1"; - sha256 = "sha256-iU1tsA9MKKH/zjuBxD5yExJOPoL2V/OG3WYc9w0do9I="; - }; - python = pkgs.python39; - }; - }; -}