From 8af9c97c0d6ee8e5f5fe3e61479ebc56c5ffb761 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 2 Apr 2020 23:40:55 +0300
Subject: [PATCH] nixos/tests: move mysql tests to subfolder

---
 nixos/tests/all-tests.nix                                 | 8 ++++----
 .../{automysqlbackup.nix => mysql/mysql-autobackup.nix}   | 2 +-
 nixos/tests/{ => mysql}/mysql-backup.nix                  | 2 +-
 nixos/tests/{ => mysql}/mysql-replication.nix             | 2 +-
 nixos/tests/{ => mysql}/mysql.nix                         | 2 +-
 nixos/tests/{ => mysql}/testdb.sql                        | 0
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename nixos/tests/{automysqlbackup.nix => mysql/mysql-autobackup.nix} (95%)
 rename nixos/tests/{ => mysql}/mysql-backup.nix (96%)
 rename nixos/tests/{ => mysql}/mysql-replication.nix (98%)
 rename nixos/tests/{ => mysql}/mysql.nix (99%)
 rename nixos/tests/{ => mysql}/testdb.sql (100%)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d1b1acc292d..8857d191a49 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -24,7 +24,6 @@ in
   _3proxy = handleTest ./3proxy.nix {};
   acme = handleTest ./acme.nix {};
   atd = handleTest ./atd.nix {};
-  automysqlbackup = handleTest ./automysqlbackup.nix {};
   avahi = handleTest ./avahi.nix {};
   babeld = handleTest ./babeld.nix {};
   bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64
@@ -197,9 +196,10 @@ in
   munin = handleTest ./munin.nix {};
   mutableUsers = handleTest ./mutable-users.nix {};
   mxisd = handleTest ./mxisd.nix {};
-  mysql = handleTest ./mysql.nix {};
-  mysqlBackup = handleTest ./mysql-backup.nix {};
-  mysqlReplication = handleTest ./mysql-replication.nix {};
+  mysql = handleTest ./mysql/mysql.nix {};
+  mysql-autobackup = handleTest ./mysql/mysql-autobackup.nix {};
+  mysql-backup = handleTest ./mysql/mysql-backup.nix {};
+  mysql-replication = handleTest ./mysql/mysql-replication.nix {};
   nagios = handleTest ./nagios.nix {};
   nat.firewall = handleTest ./nat.nix { withFirewall = true; };
   nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; };
diff --git a/nixos/tests/automysqlbackup.nix b/nixos/tests/mysql/mysql-autobackup.nix
similarity index 95%
rename from nixos/tests/automysqlbackup.nix
rename to nixos/tests/mysql/mysql-autobackup.nix
index 224b93862fb..65576e52a53 100644
--- a/nixos/tests/automysqlbackup.nix
+++ b/nixos/tests/mysql/mysql-autobackup.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }:
+import ./../make-test-python.nix ({ pkgs, lib, ... }:
 
 {
   name = "automysqlbackup";
diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql/mysql-backup.nix
similarity index 96%
rename from nixos/tests/mysql-backup.nix
rename to nixos/tests/mysql/mysql-backup.nix
index a0595e4d553..c4c1079a8a6 100644
--- a/nixos/tests/mysql-backup.nix
+++ b/nixos/tests/mysql/mysql-backup.nix
@@ -1,5 +1,5 @@
 # Test whether mysqlBackup option works
-import ./make-test-python.nix ({ pkgs, ... } : {
+import ./../make-test-python.nix ({ pkgs, ... } : {
   name = "mysql-backup";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ rvl ];
diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix
similarity index 98%
rename from nixos/tests/mysql-replication.nix
rename to nixos/tests/mysql/mysql-replication.nix
index a2654f041ad..81038dccd94 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql/mysql-replication.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ...} :
+import ./../make-test-python.nix ({ pkgs, ...} :
 
 let
   replicateUser = "replicate";
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql/mysql.nix
similarity index 99%
rename from nixos/tests/mysql.nix
rename to nixos/tests/mysql/mysql.nix
index 11c1dabf936..d236ce94632 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql/mysql.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./../make-test-python.nix ({ pkgs, ...} : {
   name = "mysql";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ eelco shlevy ];
diff --git a/nixos/tests/testdb.sql b/nixos/tests/mysql/testdb.sql
similarity index 100%
rename from nixos/tests/testdb.sql
rename to nixos/tests/mysql/testdb.sql