From 2fad28f3b67025f778b0e8ac211af1b60dec6699 Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Mon, 20 Sep 2021 16:33:07 -0600
Subject: [PATCH] Move NixOS systems tests to `nixos/tests`.

---
 nixos/system-tests.nix                          |  4 ++--
 nixos/{modules => }/tests/exercise-storage.py   |  0
 nixos/{modules => }/tests/get-passes.py         |  0
 nixos/{modules => }/tests/node.pem              |  0
 nixos/{modules => }/tests/private-storage.nix   | 14 +++++++-------
 nixos/{modules => }/tests/probeuser_ed25519     |  0
 nixos/{modules => }/tests/probeuser_ed25519.pub |  0
 nixos/{modules => }/tests/run-client.py         |  0
 nixos/{modules => }/tests/run-introducer.py     |  0
 nixos/{modules => }/tests/stripe-api-double.py  |  0
 nixos/{modules => }/tests/tahoe.nix             |  4 ++--
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename nixos/{modules => }/tests/exercise-storage.py (100%)
 rename nixos/{modules => }/tests/get-passes.py (100%)
 rename nixos/{modules => }/tests/node.pem (100%)
 rename nixos/{modules => }/tests/private-storage.nix (97%)
 rename nixos/{modules => }/tests/probeuser_ed25519 (100%)
 rename nixos/{modules => }/tests/probeuser_ed25519.pub (100%)
 rename nixos/{modules => }/tests/run-client.py (100%)
 rename nixos/{modules => }/tests/run-introducer.py (100%)
 rename nixos/{modules => }/tests/stripe-api-double.py (100%)
 rename nixos/{modules => }/tests/tahoe.nix (97%)

diff --git a/nixos/system-tests.nix b/nixos/system-tests.nix
index ff37fc85..73b6665a 100644
--- a/nixos/system-tests.nix
+++ b/nixos/system-tests.nix
@@ -2,6 +2,6 @@
 let
   pkgs = import ../nixpkgs-2105.nix { };
 in {
-  private-storage = pkgs.nixosTest ./modules/tests/private-storage.nix;
-  tahoe = pkgs.nixosTest ./modules/tests/tahoe.nix;
+  private-storage = pkgs.nixosTest ./tests/private-storage.nix;
+  tahoe = pkgs.nixosTest ./tests/tahoe.nix;
 }
diff --git a/nixos/modules/tests/exercise-storage.py b/nixos/tests/exercise-storage.py
similarity index 100%
rename from nixos/modules/tests/exercise-storage.py
rename to nixos/tests/exercise-storage.py
diff --git a/nixos/modules/tests/get-passes.py b/nixos/tests/get-passes.py
similarity index 100%
rename from nixos/modules/tests/get-passes.py
rename to nixos/tests/get-passes.py
diff --git a/nixos/modules/tests/node.pem b/nixos/tests/node.pem
similarity index 100%
rename from nixos/modules/tests/node.pem
rename to nixos/tests/node.pem
diff --git a/nixos/modules/tests/private-storage.nix b/nixos/tests/private-storage.nix
similarity index 97%
rename from nixos/modules/tests/private-storage.nix
rename to nixos/tests/private-storage.nix
index 55d28bbf..6fb85a67 100644
--- a/nixos/modules/tests/private-storage.nix
+++ b/nixos/tests/private-storage.nix
@@ -90,7 +90,7 @@ in {
     # Get a machine where we can run a Tahoe-LAFS client node.
     client =
       { config, pkgs, ourpkgs, ... }:
-      { imports = [ ../packages.nix ];
+      { imports = [ ../modules/packages.nix ];
         environment.systemPackages = [
           pkgs.daemonize
           # A Tahoe-LAFS configuration capable of using the right storage
@@ -108,9 +108,9 @@ in {
     storage =
       { config, pkgs, ... }:
       { imports =
-        [ ../packages.nix
-          ../private-storage.nix
-          ../ssh.nix
+        [ ../modules/packages.nix
+          ../modules/private-storage.nix
+          ../modules/ssh.nix
         ];
         services.private-storage = {
           enable = true;
@@ -127,9 +127,9 @@ in {
     issuer =
     { config, pkgs, ... }:
     { imports =
-      [ ../packages.nix
-        ../issuer.nix
-        ../ssh.nix
+      [ ../modules/packages.nix
+        ../modules/issuer.nix
+        ../modules/ssh.nix
       ];
       services.private-storage.sshUsers = sshUsers;
 
diff --git a/nixos/modules/tests/probeuser_ed25519 b/nixos/tests/probeuser_ed25519
similarity index 100%
rename from nixos/modules/tests/probeuser_ed25519
rename to nixos/tests/probeuser_ed25519
diff --git a/nixos/modules/tests/probeuser_ed25519.pub b/nixos/tests/probeuser_ed25519.pub
similarity index 100%
rename from nixos/modules/tests/probeuser_ed25519.pub
rename to nixos/tests/probeuser_ed25519.pub
diff --git a/nixos/modules/tests/run-client.py b/nixos/tests/run-client.py
similarity index 100%
rename from nixos/modules/tests/run-client.py
rename to nixos/tests/run-client.py
diff --git a/nixos/modules/tests/run-introducer.py b/nixos/tests/run-introducer.py
similarity index 100%
rename from nixos/modules/tests/run-introducer.py
rename to nixos/tests/run-introducer.py
diff --git a/nixos/modules/tests/stripe-api-double.py b/nixos/tests/stripe-api-double.py
similarity index 100%
rename from nixos/modules/tests/stripe-api-double.py
rename to nixos/tests/stripe-api-double.py
diff --git a/nixos/modules/tests/tahoe.nix b/nixos/tests/tahoe.nix
similarity index 97%
rename from nixos/modules/tests/tahoe.nix
rename to nixos/tests/tahoe.nix
index 624a9691..e39fd6d3 100644
--- a/nixos/modules/tests/tahoe.nix
+++ b/nixos/tests/tahoe.nix
@@ -3,8 +3,8 @@
   nodes = {
     storage = { config, pkgs, ourpkgs, ... }: {
       imports = [
-        ../packages.nix
-        ../tahoe.nix
+        ../modules/packages.nix
+        ../modules/tahoe.nix
       ];
 
       services.tahoe.nodes.storage = {
-- 
GitLab