Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix 22.11 tests (#3678)

Browse source 
* broot: update test to match upstream changes

Fixes #3527

(cherry picked from commit 18b56e3f7d)

* broot: simplify test slightly

(cherry picked from commit d7a3c26854)

* i3status-rust: fix tests

Nix 2.12.0 slightly changed the JSON output format. This updates the
i3status-rust test cases to match.

(cherry picked from commit 263f6e4523)
This commit is contained in:
Robert Helgesson 2023-02-25 01:27:04 +01:00 committed by GitHub
parent 00efa2d4c2
commit 2928097823
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/modules/programs/broot/broot.nix
View file

@ -1,9 +1,6 @@
{ config, lib, pkgs, ... }: { ... }:
with lib;
{ {
config = {
programs.broot = { programs.broot = {
enable = true; enable = true;
settings.modal = true; settings.modal = true;
@ -12,15 +9,18 @@ with lib;
nmt.script = '' nmt.script = ''
assertFileExists home-files/.config/broot/conf.toml assertFileExists home-files/.config/broot/conf.toml
assertFileContent home-files/.config/broot/conf.toml ${ assertFileContent home-files/.config/broot/conf.toml ${
pkgs.writeText "broot.expected" '' builtins.toFile "broot.expected" ''
content_search_max_file_size = "10MB"
imports = ["verbs.hjson", {file = "dark-blue-skin.hjson", luma = ["dark", "unknown"]}, {file = "white-skin.hjson", luma = "light"}] imports = ["verbs.hjson", {file = "dark-blue-skin.hjson", luma = ["dark", "unknown"]}, {file = "white-skin.hjson", luma = "light"}]
modal = true modal = true
show_selection_mark = true show_selection_mark = true
verbs = [] verbs = []
[skin] [skin]
[special_paths]
"/media" = "no-enter"
'' ''
} }
''; '';
};
} }

4
tests/modules/programs/i3status-rust/with-custom.nix
View file

@ -102,14 +102,14 @@ with lib;
icons = "awesome5" icons = "awesome5"
theme = "gruvbox-dark" theme = "gruvbox-dark"
[[block]] [[block]]
alert = 10 alert = 10.0
alias = "/" alias = "/"
block = "disk_space" block = "disk_space"
info_type = "available" info_type = "available"
interval = 60 interval = 60
path = "/" path = "/"
unit = "GB" unit = "GB"
warning = 20 warning = 20.0
[[block]] [[block]]
block = "memory" block = "memory"

4
tests/modules/programs/i3status-rust/with-default.nix
View file

@ -16,14 +16,14 @@ with lib;
icons = "none" icons = "none"
theme = "plain" theme = "plain"
[[block]] [[block]]
alert = 10 alert = 10.0
alias = "/" alias = "/"
block = "disk_space" block = "disk_space"
info_type = "available" info_type = "available"
interval = 60 interval = 60
path = "/" path = "/"
unit = "GB" unit = "GB"
warning = 20 warning = 20.0
[[block]] [[block]]
block = "memory" block = "memory"

4
tests/modules/programs/i3status-rust/with-extra-settings.nix
View file

@ -111,14 +111,14 @@ with lib;
pkgs.writeText "i3status-rust-expected-config" '' pkgs.writeText "i3status-rust-expected-config" ''
icons = "awesome5" icons = "awesome5"
[[block]] [[block]]
alert = 10 alert = 10.0
alias = "/" alias = "/"
block = "disk_space" block = "disk_space"
info_type = "available" info_type = "available"
interval = 60 interval = 60
path = "/" path = "/"
unit = "GB" unit = "GB"
warning = 20 warning = 20.0
[[block]] [[block]]
block = "memory" block = "memory"

4
tests/modules/programs/i3status-rust/with-multiple-bars.nix
View file

@ -62,14 +62,14 @@ with lib;
icons = "none" icons = "none"
theme = "plain" theme = "plain"
[[block]] [[block]]
alert = 10 alert = 10.0
alias = "/" alias = "/"
block = "disk_space" block = "disk_space"
info_type = "available" info_type = "available"
interval = 60 interval = 60
path = "/" path = "/"
unit = "GB" unit = "GB"
warning = 20 warning = 20.0
[[block]] [[block]]
block = "memory" block = "memory"