Skip to content

Commit bae59db

Browse files
authored
Merge pull request #172 from BirdeeHub/ci
ci(tests): address flaky jujutsu and mpv tests
2 parents f5ed0f7 + 63e31bb commit bae59db

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

wrapperModules/j/jujutsu/check.nix

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,17 @@ let
1616

1717
in
1818
pkgs.runCommand "jujutsu-test" { } ''
19-
"${jujutsuWrapped}/bin/jj" config list --user | grep -q 'user.name = "Test User"'
20-
"${jujutsuWrapped}/bin/jj" config list --user | grep -q 'user.email = "test@example.com"'
19+
if ! "${jujutsuWrapped}/bin/jj" config list --user | grep -q 'Test User'; then
20+
echo "failed to list test user!"
21+
echo "wrapper contents for ${jujutsuWrapped}/bin/jj"
22+
cat "${jujutsuWrapped}/bin/jj"
23+
exit 1
24+
fi
25+
if ! "${jujutsuWrapped}/bin/jj" config list --user | grep -q -F 'test@example.com'; then
26+
echo "failed to list test email!"
27+
echo "wrapper contents for ${jujutsuWrapped}/bin/jj"
28+
cat "${jujutsuWrapped}/bin/jj"
29+
exit 1
30+
fi
2131
touch $out
2232
''

wrapperModules/m/mpv/check.nix

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,17 @@ let
1818

1919
in
2020
pkgs.runCommand "mpv-test" { } ''
21-
"${mpvWrapped}/bin/mpv" --version | grep -q "mpv"
22-
cat "${mpvWrapped.configuration.package}/bin/mpv" | grep -q "share/mpv/scripts/visualizer.lua"
21+
if ! "${mpvWrapped}/bin/mpv" --version | grep -q "mpv"; then
22+
echo "failed to run wrapped package!"
23+
echo "wrapper content for ${mpvWrapped}/bin/mpv"
24+
cat "${mpvWrapped}/bin/mpv"
25+
exit 1
26+
fi
27+
if ! cat "${mpvWrapped.configuration.package}/bin/mpv" | LC_ALL=C grep -a -F -q "share/mpv/scripts/visualizer.lua"; then
28+
echo "failed to find added script when inspecting overriden package value"
29+
echo "overriden package value ${mpvWrapped.configuration.package}/bin/mpv"
30+
cat "${mpvWrapped.configuration.package}/bin/mpv"
31+
exit 1
32+
fi
2333
touch $out
2434
''

0 commit comments

Comments
 (0)