lol

Merge pull request #241949 from R-VdP/nixos_test_busybox

nixos/test-driver: use the short form argument to base64 for busybox compatibility.

authored by

Jacek Galowicz and committed by
GitHub
f59913ba 01332aa5

+18 -1
+1 -1
nixos/lib/test-driver/test_driver/machine.py
··· 583 583 # While sh is bash on NixOS, this is not the case for every distro. 584 584 # We explicitly call bash here to allow for the driver to boot other distros as well. 585 585 out_command = ( 586 - f"{timeout_str} bash -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n" 586 + f"{timeout_str} bash -c {shlex.quote(command)} | (base64 -w 0; echo)\n" 587 587 ) 588 588 589 589 assert self.shell
+1
nixos/tests/all-tests.nix
··· 89 89 extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {}; 90 90 lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix {}; 91 91 node-name = runTest ./nixos-test-driver/node-name.nix; 92 + busybox = runTest ./nixos-test-driver/busybox.nix; 92 93 }; 93 94 94 95 # NixOS vm tests and non-vm unit tests
+16
nixos/tests/nixos-test-driver/busybox.nix
··· 1 + { 2 + name = "Test that basic tests work when busybox is installed"; 3 + 4 + nodes = { 5 + machine = ({ pkgs, ... }: { 6 + environment.systemPackages = [ 7 + pkgs.busybox 8 + ]; 9 + }); 10 + }; 11 + 12 + testScript = '' 13 + start_all() 14 + machine.wait_for_unit("multi-user.target") 15 + ''; 16 + }