From f61a13d2dbb09beb53af157c0df0a71c3234f06c Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 29 Apr 2021 06:54:25 +0200
Subject: [PATCH 1/2] Only add the Nix system feature to the test that requires
 it

---
 t/default-machine-file.t | 6 +++++-
 t/lib/Setup.pm           | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/t/default-machine-file.t b/t/default-machine-file.t
index 01203a72..d4d3f3df 100644
--- a/t/default-machine-file.t
+++ b/t/default-machine-file.t
@@ -2,7 +2,11 @@ use feature 'unicode_strings';
 use strict;
 use Setup;
 
-my %ctx = test_init();
+my %ctx = test_init(
+  nix_config => q|
+    system-features = test-system-feature
+  |
+);
 
 require Hydra::Schema;
 require Hydra::Model::DB;
diff --git a/t/lib/Setup.pm b/t/lib/Setup.pm
index fc078ac5..b5236978 100644
--- a/t/lib/Setup.pm
+++ b/t/lib/Setup.pm
@@ -48,7 +48,6 @@ sub test_init {
     my $nixconf = "$ENV{'NIX_CONF_DIR'}/nix.conf";
     open(my $fh, '>', $nixconf) or die "Could not open file '$nixconf' $!";
     print $fh "sandbox = false\n";
-    print $fh "system-features = test-system-feature\n";
     print $fh $opts{'nix_config'} || "";
     close $fh;
 

From 305c27d3fb73294eda0aa636ba87d5d3428cd184 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 29 Apr 2021 06:55:23 +0200
Subject: [PATCH 2/2] Move the default-machine-file test under `queue-runner`

Just a bit of housekeeping to keep the testsuite clean
---
 t/{ => queue-runner}/default-machine-file.t | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename t/{ => queue-runner}/default-machine-file.t (100%)

diff --git a/t/default-machine-file.t b/t/queue-runner/default-machine-file.t
similarity index 100%
rename from t/default-machine-file.t
rename to t/queue-runner/default-machine-file.t