From 93cd2aa354dee1777bdce719338fc61ce1209b04 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 13 Mar 2023 16:43:22 -0400
Subject: [PATCH] re-enable nix-based test suite runs

---
 .circleci/config.yml |  2 +-
 nix/tahoe-lafs.nix   | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b7009c2af..8b6dc8347 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -438,7 +438,7 @@ jobs:
             cache_if_able nix-build \
               --cores 8 \
               --argstr pkgsVersion "nixpkgs-<<parameters.nixpkgs>>" \
-              tests.nix
+              nix/tests/
 
   typechecks:
     docker:
diff --git a/nix/tahoe-lafs.nix b/nix/tahoe-lafs.nix
index 11698f611..ebb66a65e 100644
--- a/nix/tahoe-lafs.nix
+++ b/nix/tahoe-lafs.nix
@@ -2,6 +2,9 @@
 , tahoe-lafs-src
 , extras
 
+# control how the test suite is run
+, doCheck ? false
+
 # always dependencies
 , attrs
 , autobahn
@@ -117,6 +120,11 @@ buildPythonPackage {
   inherit pname version;
   src = tahoe-lafs-src;
   buildInputs = pythonPackageDependencies;
+
+  inherit doCheck;
   checkInputs = pythonCheckDependencies;
-  checkPhase = "TAHOE_LAFS_HYPOTHESIS_PROFILE=ci python -m twisted.trial -j $NIX_BUILD_CORES allmydata";
+  checkPhase = ''
+    export TAHOE_LAFS_HYPOTHESIS_PROFILE=ci
+    python -m twisted.trial -j $NIX_BUILD_CORES allmydata
+  '';
 }