From ada344ac3ba83d19ae5275d415aeed8878cdacdb Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 30 Jun 2020 11:44:10 +0100 Subject: [PATCH] Formatter tests shouldn't always succeed! --- ci.nix | 2 +- nix/tests/purty.nix | 9 ++++----- nix/tests/stylish-haskell.nix | 1 - plutus-scb/src/Cardano/Node/Types.hs | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ci.nix b/ci.nix index ff6b597387f..2eea99d4351 100644 --- a/ci.nix +++ b/ci.nix @@ -22,7 +22,7 @@ in dimension "System" (systems genericPkgs) (systemName: system: lib = pkgs.lib; platformFilter = platformFilterGeneric pkgs system; in filterAttrsOnlyRecursive (_: v: platformFilter v) { - inherit (packageSet) docs papers dev plutus-playground marlowe-playground plutus-scb marlowe-symbolic-lambda; + inherit (packageSet) docs papers dev tests plutus-playground marlowe-playground plutus-scb marlowe-symbolic-lambda; haskell = let # These functions pull out from the Haskell package set either all the components of a particular type, or diff --git a/nix/tests/purty.nix b/nix/tests/purty.nix index fbe2391d5bb..8969c6e110a 100644 --- a/nix/tests/purty.nix +++ b/nix/tests/purty.nix @@ -7,16 +7,15 @@ let filter = with lib; name: type: let baseName = baseNameOf (toString name); in ( (type == "regular" && hasSuffix ".purs" baseName) || - (type == "directory" && (baseName != "generated" - && baseName != "output" - && baseName != "node_modules" - && baseName != ".psc-package" + (type == "directory" && (baseName != "generated" + && baseName != "output" + && baseName != "node_modules" + && baseName != ".psc-package" && baseName != ".spago")) ); }; in runCommand "purty-check" { - succeedOnFailure = true; buildInputs = [ purty diffutils glibcLocales ]; } '' set +e diff --git a/nix/tests/stylish-haskell.nix b/nix/tests/stylish-haskell.nix index c68d681e101..f624e602ec9 100644 --- a/nix/tests/stylish-haskell.nix +++ b/nix/tests/stylish-haskell.nix @@ -13,7 +13,6 @@ let }; in runCommand "stylish-check" { - succeedOnFailure = true; buildInputs = [ stylish-haskell diffutils glibcLocales ]; } '' set +e diff --git a/plutus-scb/src/Cardano/Node/Types.hs b/plutus-scb/src/Cardano/Node/Types.hs index 858273f52f0..34e7759ebab 100644 --- a/plutus-scb/src/Cardano/Node/Types.hs +++ b/plutus-scb/src/Cardano/Node/Types.hs @@ -17,8 +17,8 @@ import GHC.Generics (Generic) import qualified Language.Plutus.Contract.Trace as Trace import Servant (FromHttpApiData, ToHttpApiData) import Servant.Client (BaseUrl) +import Wallet.Emulator (Wallet) import qualified Wallet.Emulator as EM -import Wallet.Emulator (Wallet) import Wallet.Emulator.Chain (ChainEvent, ChainState) import qualified Wallet.Emulator.MultiAgent as MultiAgent