Fix 22.11 tests (#3678)

* 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

View file

@ -1,26 +1,26 @@
{ config, lib, pkgs, ... }:
with lib;
{ ... }:
{
config = {
programs.broot = {
enable = true;
settings.modal = true;
};
nmt.script = ''
assertFileExists home-files/.config/broot/conf.toml
assertFileContent home-files/.config/broot/conf.toml ${
pkgs.writeText "broot.expected" ''
imports = ["verbs.hjson", {file = "dark-blue-skin.hjson", luma = ["dark", "unknown"]}, {file = "white-skin.hjson", luma = "light"}]
modal = true
show_selection_mark = true
verbs = []
[skin]
''
}
'';
programs.broot = {
enable = true;
settings.modal = true;
};
nmt.script = ''
assertFileExists home-files/.config/broot/conf.toml
assertFileContent home-files/.config/broot/conf.toml ${
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"}]
modal = true
show_selection_mark = true
verbs = []
[skin]
[special_paths]
"/media" = "no-enter"
''
}
'';
}

View file

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

View file

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

View file

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

View file

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