From d389f7621f18836804acec6526764143ea90438c Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 12 Nov 2019 12:23:07 -0500
Subject: [PATCH] Some more development conveniences
eg: nix-build --arg trialArgs '["-x"]'
---
default.nix | 4 ++--
zkapauthorizer.nix | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/default.nix b/default.nix
index 3a47363..04193ed 100644
--- a/default.nix
+++ b/default.nix
@@ -1,2 +1,2 @@
-{ pkgs ? import ./nixpkgs.nix { }, hypothesisProfile ? null, collectCoverage ? false, testSuite ? null }:
-pkgs.python27Packages.zkapauthorizer.override { inherit hypothesisProfile collectCoverage testSuite; }
+{ pkgs ? import ./nixpkgs.nix { }, hypothesisProfile ? null, collectCoverage ? false, testSuite ? null, trialArgs ? [] }:
+pkgs.python27Packages.zkapauthorizer.override { inherit hypothesisProfile collectCoverage testSuite trialArgs; }
diff --git a/zkapauthorizer.nix b/zkapauthorizer.nix
index 462d8fb..fb54924 100644
--- a/zkapauthorizer.nix
+++ b/zkapauthorizer.nix
@@ -4,10 +4,12 @@
, hypothesisProfile ? null
, collectCoverage ? false
, testSuite ? null
+, trialArgs ? []
}:
let
hypothesisProfile' = if hypothesisProfile == null then "default" else hypothesisProfile;
testSuite' = if testSuite == null then "_zkapauthorizer" else testSuite;
+ extraTrialArgs = builtins.concatStringsSep " " trialArgs;
in
buildPythonPackage rec {
version = "0.0";
@@ -39,15 +41,14 @@ buildPythonPackage rec {
treq
];
-
-
checkPhase = ''
runHook preCheck
+ set -x
"${pyflakes}/bin/pyflakes" src/_zkapauthorizer
ZKAPAUTHORIZER_HYPOTHESIS_PROFILE=${hypothesisProfile'} python -m ${if collectCoverage
then "coverage run --branch --source _zkapauthorizer,twisted.plugins.zkapauthorizer --module"
else ""
- } twisted.trial ${testSuite'}
+ } twisted.trial ${extraTrialArgs} ${testSuite'}
runHook postCheck
'';
--
GitLab