git.iko.soy/typeable/nixpkgs
on master help sign in
xxh: added tests
commit45db27da2ee6b8923c2ad5fcde2af1d82215fb69 authorPasquale <p3dimaria@hotmail.it> dateSat 1 Jan 2022, 22:16 (5 years ago) parent5e9f0c1
4 files changed+75−1
nixos/tests/all-tests.nix+1 nixos/tests/xxh.nix+67 pkgs/tools/networking/xxh/default.nix+5−1 pkgs/top-level/all-packages.nix+2
nixos/tests/all-tests.nix+1
@@ -504,6 +504,7 @@ in
504504 xrdp = handleTest ./xrdp.nix {};
505505 xss-lock = handleTest ./xss-lock.nix {};
506506 xterm = handleTest ./xterm.nix {};
507+ xxh = handleTest ./xxh.nix {};
507508 yabar = handleTest ./yabar.nix {};
508509 yggdrasil = handleTest ./yggdrasil.nix {};
509510 zfs = handleTest ./zfs.nix {};
nixos/tests/xxh.nixnew file+67
@@ -0,0 +1,67 @@
1+import ./make-test-python.nix ({ pkgs, lib, ... }:
2+
3+ let
4+ inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
5+ xxh-shell-zsh = pkgs.stdenv.mkDerivation {
6+ pname = "xxh-shell-zsh";
7+ version = "";
8+ src = pkgs.fetchFromGitHub {
9+ owner = "xxh";
10+ repo = "xxh-shell-zsh";
11+ # gets rarely updated, we can then just replace the hash
12+ rev = "91e1f84f8d6e0852c3235d4813f341230cac439f";
13+ sha256 = "sha256-Y1FrIRxTd0yooK+ZzKcCd6bLSy5E2fRXYAzrIsm7rIc=";
14+ };
15+
16+ postPatch = ''
17+ substituteInPlace build.sh \
18+ --replace "echo Install wget or curl" "cp ${zsh-portable-binary} zsh-5.8-linux-x86_64.tar.gz" \
19+ --replace "command -v curl" "command -v this-should-not-trigger"
20+ '';
21+
22+ installPhase = ''
23+ mkdir -p $out
24+ mv * $out/
25+ '';
26+ };
27+
28+ zsh-portable-binary = pkgs.fetchurl {
29+ # kept in sync with https://github.com/xxh/xxh-shell-zsh/tree/master/build.sh#L27
30+ url = "https://github.com/romkatv/zsh-bin/releases/download/v3.0.1/zsh-5.8-linux-x86_64.tar.gz";
31+ sha256 = "sha256-i8flMd2Isc0uLoeYQNDnOGb/kK3oTFVqQgIx7aOAIIo=";
32+ };
33+ in
34+ {
35+ name = "xxh";
36+ meta = with lib.maintainers; {
37+ maintainers = [ lom ];
38+ };
39+
40+ nodes = {
41+ server = { ... }: {
42+ services.openssh.enable = true;
43+ users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
44+ };
45+
46+ client = { ... }: {
47+ programs.zsh.enable = true;
48+ users.users.root.shell = pkgs.zsh;
49+ environment.systemPackages = with pkgs; [ xxh git ];
50+ };
51+ };
52+
53+ testScript = ''
54+ start_all()
55+
56+ client.succeed("mkdir -m 700 /root/.ssh")
57+
58+ client.succeed(
59+ "cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa"
60+ )
61+ client.succeed("chmod 600 /root/.ssh/id_ecdsa")
62+
63+ server.wait_for_unit("sshd")
64+
65+ client.succeed("xxh server -i /root/.ssh/id_ecdsa +hc \'echo $0\' +i +s zsh +I xxh-shell-zsh+path+${xxh-shell-zsh} | grep -Fq '/root/.xxh/.xxh/shells/xxh-shell-zsh/build/zsh-bin/bin/zsh'")
66+ '';
67+ })
pkgs/tools/networking/xxh/default.nix+5−1
@@ -1,4 +1,4 @@
1−{ lib, fetchFromGitHub, buildPythonApplication, pexpect, pyyaml, openssh }:
1+{ lib, fetchFromGitHub, buildPythonApplication, pexpect, pyyaml, openssh, nixosTests }:
22
33buildPythonApplication rec{
44 pname = "xxh";
@@ -13,6 +13,10 @@ buildPythonApplication rec{
1313
1414 propagatedBuildInputs = [ pexpect pyyaml openssh ];
1515
16+ passthru.tests = {
17+ inherit (nixosTests) xxh;
18+ };
19+
1620 meta = with lib; {
1721 description = "Bring your favorite shell wherever you go through ssh";
1822 homepage = "https://github.com/xxh/xxh";
pkgs/top-level/all-packages.nix+2
@@ -29219,6 +29219,8 @@ with pkgs;
2921929219 gtk = gtk2;
2922029220 };
2922129221
29222+ xxh = with python3Packages; toPythonApplication xxh;
29223+
2922229224 kodiPackages = recurseIntoAttrs (kodi.packages);
2922329225
2922429226 kodi = callPackage ../applications/video/kodi {