Merge pull request #103988 from NeQuissimus/nano_update

nano: Update script, test
This commit is contained in:
Tim Steinbach 2020-11-17 12:14:51 -05:00 committed by GitHub
commit 0984125676
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 81 additions and 10 deletions

View file

@ -97,6 +97,7 @@ in rec {
(onFullSupported "nixos.tests.login") (onFullSupported "nixos.tests.login")
(onFullSupported "nixos.tests.misc") (onFullSupported "nixos.tests.misc")
(onFullSupported "nixos.tests.mutableUsers") (onFullSupported "nixos.tests.mutableUsers")
(onFullSupported "nixos.tests.nano")
(onFullSupported "nixos.tests.nat.firewall-conntrack") (onFullSupported "nixos.tests.nat.firewall-conntrack")
(onFullSupported "nixos.tests.nat.firewall") (onFullSupported "nixos.tests.nat.firewall")
(onFullSupported "nixos.tests.nat.standalone") (onFullSupported "nixos.tests.nat.standalone")

View file

@ -225,6 +225,7 @@ in
mysql-backup = handleTest ./mysql/mysql-backup.nix {}; mysql-backup = handleTest ./mysql/mysql-backup.nix {};
mysql-replication = handleTest ./mysql/mysql-replication.nix {}; mysql-replication = handleTest ./mysql/mysql-replication.nix {};
nagios = handleTest ./nagios.nix {}; nagios = handleTest ./nagios.nix {};
nano = handleTest ./nano.nix {};
nar-serve = handleTest ./nar-serve.nix {}; nar-serve = handleTest ./nar-serve.nix {};
nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall = handleTest ./nat.nix { withFirewall = true; };
nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; };

44
nixos/tests/nano.nix Normal file
View file

@ -0,0 +1,44 @@
import ./make-test-python.nix ({ pkgs, ...} : {
name = "nano";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
};
machine = { lib, ... }: {
environment.systemPackages = [ pkgs.nano ];
};
testScript = { ... }: ''
start_all()
with subtest("Create user and log in"):
machine.wait_for_unit("multi-user.target")
machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
machine.succeed("useradd -m alice")
machine.succeed("(echo foobar; echo foobar) | passwd alice")
machine.wait_until_tty_matches(1, "login: ")
machine.send_chars("alice\n")
machine.wait_until_tty_matches(1, "login: alice")
machine.wait_until_succeeds("pgrep login")
machine.wait_until_tty_matches(1, "Password: ")
machine.send_chars("foobar\n")
machine.wait_until_succeeds("pgrep -u alice bash")
machine.screenshot("prompt")
with subtest("Use nano"):
machine.send_chars("nano /tmp/foo")
machine.send_key("ret")
machine.sleep(2)
machine.send_chars("42")
machine.sleep(1)
machine.send_key("ctrl-x")
machine.sleep(1)
machine.send_key("y")
machine.sleep(1)
machine.screenshot("nano")
machine.sleep(1)
machine.send_key("ret")
machine.wait_for_file("/tmp/foo")
assert "42" in machine.succeed("cat /tmp/foo")
'';
})

View file

@ -1,10 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub { stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript
, ncurses , common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests
, texinfo , gettext ? null, enableNls ? true, enableTiny ? false }:
, gettext ? null
, enableNls ? true
, enableTiny ? false
}:
assert enableNls -> (gettext != null); assert enableNls -> (gettext != null);
@ -44,13 +40,42 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = {
tests = { inherit (nixosTests) nano; };
updateScript = writeScript "update.sh" ''
#!${stdenv.shell}
set -o errexit
PATH=${
stdenv.lib.makeBinPath [
common-updater-scripts
git
nixfmt
nix
coreutils
gnused
]
}
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')"
latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git://git.savannah.gnu.org/nano.git '*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')"
if [ ! "$oldVersion" = "$latestTag" ]; then
update-source-version ${pname} "$latestTag" --version-key=version --print-changes
nixpkgs="$(git rev-parse --show-toplevel)"
default_nix="$nixpkgs/pkgs/applications/editors/nano/default.nix"
nixfmt "$default_nix"
else
echo "${pname} is already up-to-date"
fi
'';
};
meta = { meta = {
homepage = "https://www.nano-editor.org/"; homepage = "https://www.nano-editor.org/";
description = "A small, user-friendly console text editor"; description = "A small, user-friendly console text editor";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ maintainers = with maintainers; [ joachifm nequissimus ];
joachifm
];
platforms = platforms.all; platforms = platforms.all;
}; };
} }