diff options
| author | aszlig <aszlig@nix.build> | 2021-06-16 04:38:34 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2021-06-16 04:38:34 +0200 |
| commit | 6db890aff777e68a8ad41ce6068ddeddb56f26d1 (patch) | |
| tree | 0ea0efc4a8fe682e48e6e87e9d296c22b166cd89 /nixos | |
| parent | 56e1dac7c81ec3efd937111966949e55134efab8 (diff) | |
| parent | c55e00d8ff288b769d5a9f3c3052b7941b8091cf (diff) | |
| download | nixpkgs-6db890aff777e68a8ad41ce6068ddeddb56f26d1.tar nixpkgs-6db890aff777e68a8ad41ce6068ddeddb56f26d1.tar.gz nixpkgs-6db890aff777e68a8ad41ce6068ddeddb56f26d1.tar.bz2 nixpkgs-6db890aff777e68a8ad41ce6068ddeddb56f26d1.tar.lz nixpkgs-6db890aff777e68a8ad41ce6068ddeddb56f26d1.tar.xz nixpkgs-6db890aff777e68a8ad41ce6068ddeddb56f26d1.tar.zst nixpkgs-6db890aff777e68a8ad41ce6068ddeddb56f26d1.zip | |
Merge pull request #127025 (fix overlayfs test)
This essentially fixes the overlayfs test, which was broken since a while but since commit b7749c76715ba96727f7a12bc2514ddfa6847813 was pushed to master the error has actually surfaced. The reason why I'm merging this immediately without additional review is because the change is fixing something that's currently broken so the worst that could happen is that things are still broken. However, since I did open a pull request, the checks done by @ofborg at least seem to suggest that this is indeed fixing the test.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/overlayfs.nix | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/nixos/tests/overlayfs.nix b/nixos/tests/overlayfs.nix index 142e7d378b2..1768f1fea1e 100644 --- a/nixos/tests/overlayfs.nix +++ b/nixos/tests/overlayfs.nix @@ -15,36 +15,33 @@ import ./make-test-python.nix ({ pkgs, ... }: { # Test ext4 + overlayfs machine.succeed( - """ - mkfs.ext4 -F -L overlay-ext4 /dev/vdb - mount -t ext4 /dev/vdb /tmp/mnt - mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged - # Setup some existing files - echo 'Replace' > /tmp/mnt/lower/replace.txt - echo 'Append' > /tmp/mnt/lower/append.txt - echo 'Overwrite' > /tmp/mnt/lower/overwrite.txt - mount -t overlay overlay -o lowerdir=/tmp/mnt/lower,upperdir=/tmp/mnt/upper,workdir=/tmp/mnt/work /tmp/mnt/merged - # Test new - echo 'New' > /tmp/mnt/merged/new.txt - [[ "\$(cat /tmp/mnt/merged/new.txt)" == "New" ]] - # Test replace - [[ "\$(cat /tmp/mnt/merged/replace.txt)" == "Replace" ]] - echo 'Replaced' > /tmp/mnt/merged/replace-tmp.txt - mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt - [[ "\$(cat /tmp/mnt/merged/replace.txt)" == "Replaced" ]] - # Overwrite - [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwrite" ]] - echo 'Overwritten' > /tmp/mnt/merged/overwrite.txt - [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwritten" ]] - # Test append - [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append" ]] - echo 'ed' >> /tmp/mnt/merged/append.txt - #"cat /tmp/mnt/merged/append.txt && exit 1 - [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append\ned" ]] - umount /tmp/mnt/merged - umount /tmp/mnt - udevadm settle - """ + 'mkfs.ext4 -F -L overlay-ext4 /dev/vdb', + 'mount -t ext4 /dev/vdb /tmp/mnt', + 'mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged', + # Setup some existing files + 'echo Replace > /tmp/mnt/lower/replace.txt', + 'echo Append > /tmp/mnt/lower/append.txt', + 'echo Overwrite > /tmp/mnt/lower/overwrite.txt', + 'mount -t overlay overlay -o lowerdir=/tmp/mnt/lower,upperdir=/tmp/mnt/upper,workdir=/tmp/mnt/work /tmp/mnt/merged', + # Test new + 'echo New > /tmp/mnt/merged/new.txt', + '[[ "$(cat /tmp/mnt/merged/new.txt)" == New ]]', + # Test replace + '[[ "$(cat /tmp/mnt/merged/replace.txt)" == Replace ]]', + 'echo Replaced > /tmp/mnt/merged/replace-tmp.txt', + 'mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt', + '[[ "$(cat /tmp/mnt/merged/replace.txt)" == Replaced ]]', + # Overwrite + '[[ "$(cat /tmp/mnt/merged/overwrite.txt)" == Overwrite ]]', + 'echo Overwritten > /tmp/mnt/merged/overwrite.txt', + '[[ "$(cat /tmp/mnt/merged/overwrite.txt)" == Overwritten ]]', + # Test append + '[[ "$(cat /tmp/mnt/merged/append.txt)" == Append ]]', + 'echo ed >> /tmp/mnt/merged/append.txt', + '[[ "$(cat /tmp/mnt/merged/append.txt)" == "Append\ned" ]]', + 'umount /tmp/mnt/merged', + 'umount /tmp/mnt', + 'udevadm settle', ) ''; }) |