From ebdfa06685966bd3793213cd3b2d21fd279373e4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 10 Apr 2020 00:25:21 +0200 Subject: [PATCH] tests: update nmt --- .travis.yml | 2 +- tests/default.nix | 4 ++-- tests/modules/services/polybar/basic-configuration.nix | 2 +- tests/modules/services/sxhkd/configuration.nix | 2 +- tests/modules/services/sxhkd/service.nix | 2 +- tests/modules/systemd/services.nix | 2 +- tests/modules/systemd/session-variables.nix | 2 +- tests/modules/systemd/timers.nix | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e5e73d06..f9e506a56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ before_script: script: - ./format -c - nix-shell . -A install - - nix-shell --pure tests -A run.all + - nix-shell --pure --max-jobs 10 tests -A run.all diff --git a/tests/default.nix b/tests/default.nix index 493672d71..8913859da 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -7,8 +7,8 @@ let nmt = pkgs.fetchFromGitLab { owner = "rycee"; repo = "nmt"; - rev = "4174e11107ba808b3001ede2f9f245481dfdfb2e"; - sha256 = "0vzdh7211dxmd4c3371l5b2v5i3b8rip2axk8l5xqlwddp3jiy5n"; + rev = "ae9ce0033dbd28b4774142a67369f41c11753555"; + sha256 = "1m5jqhflykya5h6s69ps6r70ffbsr6qkxdq1miqa68msshl21f9y"; }; modules = import ../modules/modules.nix { diff --git a/tests/modules/services/polybar/basic-configuration.nix b/tests/modules/services/polybar/basic-configuration.nix index a50bcdf53..a8886dab6 100644 --- a/tests/modules/services/polybar/basic-configuration.nix +++ b/tests/modules/services/polybar/basic-configuration.nix @@ -34,7 +34,7 @@ }; nmt.script = '' - local serviceFile=home-files/.config/systemd/user/polybar.service + serviceFile=home-files/.config/systemd/user/polybar.service assertFileExists $serviceFile assertFileRegex $serviceFile 'X-Restart-Triggers=.*polybar\.conf' diff --git a/tests/modules/services/sxhkd/configuration.nix b/tests/modules/services/sxhkd/configuration.nix index 3c9d8b52b..03206a8d5 100644 --- a/tests/modules/services/sxhkd/configuration.nix +++ b/tests/modules/services/sxhkd/configuration.nix @@ -23,7 +23,7 @@ [ (self: super: { sxhkd = pkgs.writeScriptBin "dummy-sxhkd" ""; }) ]; nmt.script = '' - local sxhkdrc=home-files/.config/sxhkd/sxhkdrc + sxhkdrc=home-files/.config/sxhkd/sxhkdrc assertFileExists $sxhkdrc diff --git a/tests/modules/services/sxhkd/service.nix b/tests/modules/services/sxhkd/service.nix index 46ce259a7..9b4fd70cc 100644 --- a/tests/modules/services/sxhkd/service.nix +++ b/tests/modules/services/sxhkd/service.nix @@ -7,7 +7,7 @@ }; nmt.script = '' - local serviceFile=home-files/.config/systemd/user/sxhkd.service + serviceFile=home-files/.config/systemd/user/sxhkd.service assertFileExists $serviceFile diff --git a/tests/modules/systemd/services.nix b/tests/modules/systemd/services.nix index f1f7a42bb..ea9b2b4fb 100644 --- a/tests/modules/systemd/services.nix +++ b/tests/modules/systemd/services.nix @@ -15,7 +15,7 @@ with lib; }; nmt.script = '' - local serviceFile=home-files/.config/systemd/user/test-service@.service + serviceFile=home-files/.config/systemd/user/test-service@.service assertFileExists $serviceFile assertFileContent $serviceFile ${./services-expected.conf} ''; diff --git a/tests/modules/systemd/session-variables.nix b/tests/modules/systemd/session-variables.nix index 7cfb4a6c7..b725827ce 100644 --- a/tests/modules/systemd/session-variables.nix +++ b/tests/modules/systemd/session-variables.nix @@ -10,7 +10,7 @@ with lib; }; nmt.script = '' - local envFile=home-files/.config/environment.d/10-home-manager.conf + envFile=home-files/.config/environment.d/10-home-manager.conf assertFileExists $envFile assertFileContent $envFile ${./session-variables-expected.conf} ''; diff --git a/tests/modules/systemd/timers.nix b/tests/modules/systemd/timers.nix index eaa43f176..1c0e27222 100644 --- a/tests/modules/systemd/timers.nix +++ b/tests/modules/systemd/timers.nix @@ -13,8 +13,8 @@ with lib; }; nmt.script = '' - local unitDir=home-files/.config/systemd/user - local timerFile=$unitDir/test-timer.timer + unitDir=home-files/.config/systemd/user + timerFile=$unitDir/test-timer.timer assertFileExists $timerFile assertFileContent $timerFile ${./timers-expected.conf}