Unverified Commit f59913ba authored by Jacek Galowicz's avatar Jacek Galowicz Committed by GitHub
Browse files

Merge pull request #241949 from R-VdP/nixos_test_busybox

nixos/test-driver: use the short form argument to base64 for busybox compatibility.
parents 01332aa5 9d70dfd6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ class Machine:
        # While sh is bash on NixOS, this is not the case for every distro.
        # We explicitly call bash here to allow for the driver to boot other distros as well.
        out_command = (
            f"{timeout_str} bash -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n"
            f"{timeout_str} bash -c {shlex.quote(command)} | (base64 -w 0; echo)\n"
        )

        assert self.shell
+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ in {
    extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {};
    lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix {};
    node-name = runTest ./nixos-test-driver/node-name.nix;
    busybox = runTest ./nixos-test-driver/busybox.nix;
  };

  # NixOS vm tests and non-vm unit tests
+16 −0
Original line number Diff line number Diff line
{
  name = "Test that basic tests work when busybox is installed";

  nodes = {
    machine = ({ pkgs, ... }: {
      environment.systemPackages = [
        pkgs.busybox
      ];
    });
  };

  testScript = ''
    start_all()
    machine.wait_for_unit("multi-user.target")
  '';
}