[DEVOPS-942] Fixing locale warnings and renaming walletIntegration (#…

…3206) * [DEVOPS-942] Fixing locale warnings and renaming walletIntegration * [DEVOPS-942] Fixing integration tests and shellcheck failures
input-output-hk · Jul 9, 2018 · b20ea60 · b20ea60
1 parent ecda589
commit b20ea60
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/default.nix b/default.nix
@@ -144,7 +144,7 @@ let
       shellcheck = pkgs.callPackage ./scripts/test/shellcheck.nix { inherit src; };
       hlint = pkgs.callPackage ./scripts/test/hlint.nix { inherit src; };
       stylishHaskell = pkgs.callPackage ./scripts/test/stylish.nix { inherit (cardanoPkgs) stylish-haskell; inherit src localLib; };
-      buildWalletIntegration = pkgs.callPackage ./scripts/test/wallet/integration/build-test.nix { inherit walletIntegrationTests pkgs; };
+      walletIntegration = pkgs.callPackage ./scripts/test/wallet/integration/build-test.nix { inherit walletIntegrationTests pkgs; };
       swaggerSchemaValidation = pkgs.callPackage ./scripts/test/wallet/swaggerSchemaValidation.nix { inherit gitrev; };
     };
     cardano-sl-explorer-frontend = (import ./explorer/frontend {

diff --git a/docker.nix b/docker.nix
@@ -19,6 +19,7 @@ let
     #!/bin/sh
     set -e
     set -o pipefail
+    export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"
     if [ ! -d /wallet ]; then
       echo '/wallet volume not mounted, you need to create one with `docker volume create` and pass the correct -v flag to `docker run`'
     exit 1

diff --git a/lib.nix b/lib.nix
@@ -46,7 +46,5 @@ in lib // (rec {
   utf8LocaleSetting = ''
     export LC_ALL=en_GB.UTF-8
     export LANG=en_GB.UTF-8
-  '' + lib.optionalString (pkgs.glibcLocales != null) ''
-    export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"
   '';
 })
diff --git a/scripts/haskell/update-cabal-versions.sh b/scripts/haskell/update-cabal-versions.sh
@@ -11,9 +11,9 @@ function updateVersion() {
   sed -E -i -e "s/^(version\\:\\s+)(.+)/\\1$newVersion/" "$1"
 }
 
-for CB in `git ls-files '*/cardano-*.cabal'`; do
+for CB in $(git ls-files '*/cardano-*.cabal'); do
   echo "   ${CB}"
-  updateVersion ${CB}
+  updateVersion "${CB}"
 done
 
 echo "Updated to version $newVersion"
diff --git a/scripts/test/stylish.nix b/scripts/test/stylish.nix
@@ -1,4 +1,4 @@
-{ runCommand, stylish-haskell, src, lib, localLib, diffutils }:
+{ runCommand, stylish-haskell, src, lib, localLib, diffutils, glibcLocales }:
 
 let
   # just haskell sources and the stylish-haskell config file
@@ -14,7 +14,7 @@ let
 in
 runCommand "cardano-stylish-check" {
   succeedOnFailure = true;
-  buildInputs = [ stylish-haskell diffutils ];
+  buildInputs = [ stylish-haskell diffutils glibcLocales ];
 } ''
   set +e
   ${localLib.utf8LocaleSetting}

diff --git a/scripts/test/wallet/integration/build-test.nix b/scripts/test/wallet/integration/build-test.nix
@@ -1,7 +1,7 @@
-{pkgs, stdenv, walletIntegrationTests }:
+{pkgs, stdenv, walletIntegrationTests, glibcLocales }:
 stdenv.mkDerivation rec {
   name = "cardano-wallet-integration-tests";
-  buildInputs = with pkgs; [ jq curl ];
+  buildInputs = with pkgs; [ jq curl glibcLocales ];
   buildCommand = ''
     ${walletIntegrationTests}
     if [ $? == 0 ]

diff --git a/scripts/test/wallet/integration/default.nix b/scripts/test/wallet/integration/default.nix
@@ -29,7 +29,7 @@ in pkgs.writeScript "integration-tests" ''
   # Verify we see "transaction list is empty after filtering out asset-locked source addresses" in at least 1 core node log file
   if [[ $EXIT_STATUS -eq 0 ]]
   then
-    ${pkgs.gnugrep}/bin/grep "transaction list is empty after filtering out asset-locked source addresses" state-demo/logs/node*.json
+    ${pkgs.gnugrep}/bin/grep "transaction list is empty after filtering out asset-locked source addresses" state-demo/logs/core*.json
     EXIT_STATUS=$?
   fi
   stop_cardano