Subject: [PATCH Cuirass 05/13] tests: Move common module to src/cuirass/tests.

From: Romain GARBAGE <[email-masked]>
Date: Tue, 11 Mar 2025 11:34:30 +0100

* src/cuirass/tests/common.scm: New file.
* tests/common.scm: Remove file.
* Makefile.am (nodist_noinst_DATA): Add new module.
* tests/database.scm, tests/forgejo.scm, tests/gitlab.scm, tests/http.scm,
tests/metrics.scm, tests/register.scm, tests/remote.scm: Update module
location.
---
 Makefile.am                             | 3 ++-
 {tests => src/cuirass/tests}/common.scm | 2 +-
 tests/database.scm                      | 2 +-
 tests/forgejo.scm                       | 2 +-
 tests/gitlab.scm                        | 2 +-
 tests/http.scm                          | 2 +-
 tests/metrics.scm                       | 2 +-
 tests/register.scm                      | 2 +-
 tests/remote.scm                        | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)
 rename {tests => src/cuirass/tests}/common.scm (99%)

diff --git a/Makefile.am b/Makefile.am
index e1d2cb6..75b406f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,7 +100,8 @@ nodist_scriptsobject_DATA =			\
 nodist_webobject_DATA =				\
   $(dist_webmodule_DATA:.scm=.go)
 
-nodist_noinst_DATA =			\
+nodist_noinst_DATA =				\
+  src/cuirass/tests/common.scm		  	\
   src/cuirass/tests/http.scm
 
 dist_pkgdata_DATA = src/schema.sql
diff --git a/tests/common.scm b/src/cuirass/tests/common.scm
similarity index 99%
rename from tests/common.scm
rename to src/cuirass/tests/common.scm
index 479fef3..3ebb0ad 100644
--- a/tests/common.scm
+++ b/src/cuirass/tests/common.scm
@@ -16,7 +16,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with Cuirass.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (tests common)
+(define-module (cuirass tests common)
   #:use-module ((cuirass base) #:select (%bridge-socket-file-name))
   #:use-module (cuirass database)
   #:use-module (cuirass parameters)
diff --git a/tests/database.scm b/tests/database.scm
index 2dcc68f..9dab26e 100644
--- a/tests/database.scm
+++ b/tests/database.scm
@@ -30,7 +30,7 @@
               #:select (%gc-root-directory))
              (cuirass utils)
              ((cuirass logging) #:select (current-logging-level))
-             (tests common)
+             (cuirass tests common)
              (guix channels)
              ((guix store) #:select (open-connection add-text-to-store))
              ((guix build utils)
diff --git a/tests/forgejo.scm b/tests/forgejo.scm
index 10f183a..dfb3903 100644
--- a/tests/forgejo.scm
+++ b/tests/forgejo.scm
@@ -20,7 +20,7 @@
              (cuirass forges forgejo)
              (cuirass specification)
              (cuirass utils)
-             (tests common)
+             (cuirass tests common)
              (guix channels)
              (json)
              (fibers)
diff --git a/tests/gitlab.scm b/tests/gitlab.scm
index 7d24a6a..1e29f73 100644
--- a/tests/gitlab.scm
+++ b/tests/gitlab.scm
@@ -20,7 +20,7 @@
              (cuirass forges gitlab)
              (cuirass specification)
              (cuirass utils)
-             (tests common)
+             (cuirass tests common)
              (guix channels)
              (json)
              (fibers)
diff --git a/tests/http.scm b/tests/http.scm
index a57a4ab..bee02c9 100644
--- a/tests/http.scm
+++ b/tests/http.scm
@@ -27,7 +27,7 @@
              (cuirass forges gitlab)
              (cuirass specification)
              (cuirass utils)
-             (tests common)
+             (cuirass tests common)
              (guix channels)
              (json)
              (fibers)
diff --git a/tests/metrics.scm b/tests/metrics.scm
index 195b043..759502a 100644
--- a/tests/metrics.scm
+++ b/tests/metrics.scm
@@ -20,7 +20,7 @@
 (use-modules (cuirass database)
              (cuirass metrics)
              (cuirass utils)
-             (tests common)
+             (cuirass tests common)
              ((guix build utils) #:select (call-with-temporary-output-file))
              (squee)
              (srfi srfi-64))
diff --git a/tests/register.scm b/tests/register.scm
index db0c73c..e4a2ade 100644
--- a/tests/register.scm
+++ b/tests/register.scm
@@ -20,7 +20,7 @@
              (cuirass database)
              (cuirass specification)
              (guix channels)
-             (tests common)
+             (cuirass tests common)
              (ice-9 match)
              (srfi srfi-64))
 
diff --git a/tests/remote.scm b/tests/remote.scm
index bfc1add..864579c 100644
--- a/tests/remote.scm
+++ b/tests/remote.scm
@@ -41,7 +41,7 @@
              (guix packages)
              ((guix store) #:hide (build))
              ((guix utils) #:select (%current-system))
-             (tests common)
+             (cuirass tests common)
              (fibers)
              (squee)
              (simple-zmq)
-- 
2.48.1