dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #127025 (fix overlayfs test)

Browse Source 
This essentially fixes the overlayfs test, which was broken since a
while but since commit b7749c7671 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.
This commit is contained in:
aszlig 2021-06-16 04:38:34 +02:00
commit 6db890aff7
No known key found for this signature in database
GPG Key ID: 684089CE67EBB691
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
nixos/tests/overlayfs.nix
View File

@ -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',
)
'';
})