From 74026bb1014460d511534da8a955bee6948716ee Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 20 Jan 2023 14:43:26 +0100
Subject: [PATCH] tests: Move NixOS tests to tests/nixos

This will allow contributors to find them more easily.
---
 flake.nix                                       | 14 +++++++-------
 tests/{ => nixos/containers}/containers.nix     |  0
 tests/{ => nixos/containers}/id-test.nix        |  0
 tests/{ => nixos/containers}/systemd-nspawn.nix |  0
 tests/{ => nixos}/github-flakes.nix             |  0
 tests/{ => nixos}/nix-copy-closure.nix          |  0
 tests/{ => nixos}/nss-preload.nix               |  0
 tests/{ => nixos}/remote-builds.nix             |  0
 tests/{ => nixos}/setuid.nix                    |  0
 tests/{ => nixos}/sourcehut-flakes.nix          |  0
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename tests/{ => nixos/containers}/containers.nix (100%)
 rename tests/{ => nixos/containers}/id-test.nix (100%)
 rename tests/{ => nixos/containers}/systemd-nspawn.nix (100%)
 rename tests/{ => nixos}/github-flakes.nix (100%)
 rename tests/{ => nixos}/nix-copy-closure.nix (100%)
 rename tests/{ => nixos}/nss-preload.nix (100%)
 rename tests/{ => nixos}/remote-builds.nix (100%)
 rename tests/{ => nixos}/setuid.nix (100%)
 rename tests/{ => nixos}/sourcehut-flakes.nix (100%)

diff --git a/flake.nix b/flake.nix
index 573373c42d4..0dc8c4c2ed3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -475,37 +475,37 @@
           };
 
         # System tests.
-        tests.remoteBuilds = import ./tests/remote-builds.nix {
+        tests.remoteBuilds = import ./tests/nixos/remote-builds.nix {
           system = "x86_64-linux";
           inherit nixpkgs;
           overlay = self.overlays.default;
         };
 
-        tests.nix-copy-closure = import ./tests/nix-copy-closure.nix {
+        tests.nix-copy-closure = import ./tests/nixos/nix-copy-closure.nix {
           system = "x86_64-linux";
           inherit nixpkgs;
           overlay = self.overlays.default;
         };
 
-        tests.nssPreload = (import ./tests/nss-preload.nix rec {
+        tests.nssPreload = (import ./tests/nixos/nss-preload.nix rec {
           system = "x86_64-linux";
           inherit nixpkgs;
           overlay = self.overlays.default;
         });
 
-        tests.githubFlakes = (import ./tests/github-flakes.nix rec {
+        tests.githubFlakes = (import ./tests/nixos/github-flakes.nix rec {
           system = "x86_64-linux";
           inherit nixpkgs;
           overlay = self.overlays.default;
         });
 
-        tests.sourcehutFlakes = (import ./tests/sourcehut-flakes.nix rec {
+        tests.sourcehutFlakes = (import ./tests/nixos/sourcehut-flakes.nix rec {
           system = "x86_64-linux";
           inherit nixpkgs;
           overlay = self.overlays.default;
         });
 
-        tests.containers = (import ./tests/containers.nix rec {
+        tests.containers = (import ./tests/nixos/containers/containers.nix rec {
           system = "x86_64-linux";
           inherit nixpkgs;
           overlay = self.overlays.default;
@@ -514,7 +514,7 @@
         tests.setuid = nixpkgs.lib.genAttrs
           ["i686-linux" "x86_64-linux"]
           (system:
-            import ./tests/setuid.nix rec {
+            import ./tests/nixos/setuid.nix rec {
               inherit nixpkgs system;
               overlay = self.overlays.default;
             });
diff --git a/tests/containers.nix b/tests/nixos/containers/containers.nix
similarity index 100%
rename from tests/containers.nix
rename to tests/nixos/containers/containers.nix
diff --git a/tests/id-test.nix b/tests/nixos/containers/id-test.nix
similarity index 100%
rename from tests/id-test.nix
rename to tests/nixos/containers/id-test.nix
diff --git a/tests/systemd-nspawn.nix b/tests/nixos/containers/systemd-nspawn.nix
similarity index 100%
rename from tests/systemd-nspawn.nix
rename to tests/nixos/containers/systemd-nspawn.nix
diff --git a/tests/github-flakes.nix b/tests/nixos/github-flakes.nix
similarity index 100%
rename from tests/github-flakes.nix
rename to tests/nixos/github-flakes.nix
diff --git a/tests/nix-copy-closure.nix b/tests/nixos/nix-copy-closure.nix
similarity index 100%
rename from tests/nix-copy-closure.nix
rename to tests/nixos/nix-copy-closure.nix
diff --git a/tests/nss-preload.nix b/tests/nixos/nss-preload.nix
similarity index 100%
rename from tests/nss-preload.nix
rename to tests/nixos/nss-preload.nix
diff --git a/tests/remote-builds.nix b/tests/nixos/remote-builds.nix
similarity index 100%
rename from tests/remote-builds.nix
rename to tests/nixos/remote-builds.nix
diff --git a/tests/setuid.nix b/tests/nixos/setuid.nix
similarity index 100%
rename from tests/setuid.nix
rename to tests/nixos/setuid.nix
diff --git a/tests/sourcehut-flakes.nix b/tests/nixos/sourcehut-flakes.nix
similarity index 100%
rename from tests/sourcehut-flakes.nix
rename to tests/nixos/sourcehut-flakes.nix