From 12541704052849d4160a13f7bbd873b40f19a3f9 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 18 Jan 2024 20:56:33 +0100
Subject: [PATCH] tests/nixos/fetch-git: Make the store paths unique

---
 tests/nixos/fetch-git/test-cases/http-simple/default.nix | 6 ++++--
 tests/nixos/fetch-git/test-cases/ssh-simple/default.nix  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/nixos/fetch-git/test-cases/http-simple/default.nix b/tests/nixos/fetch-git/test-cases/http-simple/default.nix
index 333ee45fd..dcab8067e 100644
--- a/tests/nixos/fetch-git/test-cases/http-simple/default.nix
+++ b/tests/nixos/fetch-git/test-cases/http-simple/default.nix
@@ -1,10 +1,12 @@
+{ config, ... }:
 {
   description = "can fetch a git repo via http";
   script = ''
     # add a file to the repo
     client.succeed(f"""
-      echo chiang-mai > {repo.path}/thailand \
-      && {repo.git} add thailand \
+      echo ${config.name /* to make the git tree and store path unique */} > {repo.path}/test-case \
+      && echo chiang-mai > {repo.path}/thailand \
+      && {repo.git} add test-case thailand \
       && {repo.git} commit -m 'commit1'
     """)
 
diff --git a/tests/nixos/fetch-git/test-cases/ssh-simple/default.nix b/tests/nixos/fetch-git/test-cases/ssh-simple/default.nix
index f2deca141..f5fba1698 100644
--- a/tests/nixos/fetch-git/test-cases/ssh-simple/default.nix
+++ b/tests/nixos/fetch-git/test-cases/ssh-simple/default.nix
@@ -1,10 +1,12 @@
+{ config, ... }:
 {
   description = "can fetch a git repo via ssh";
   script = ''
     # add a file to the repo
     client.succeed(f"""
-      echo chiang-mai > {repo.path}/thailand \
-      && {repo.git} add thailand \
+      echo ${config.name /* to make the git tree and store path unique */} > {repo.path}/test-case \
+      && echo chiang-mai > {repo.path}/thailand \
+      && {repo.git} add test-case thailand \
       && {repo.git} commit -m 'commit1'
     """)