diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-04-26 17:55:54 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-04-26 17:55:54 +0100 |
| commit | 819cba54e6a19104de39ad1b153e5116d7028bca (patch) | |
| tree | 2c59a8dca33dae88e901e4c09abbee6b1c3e94dd | |
| parent | a505423e589b4820745e855c49dded60afc04f6a (diff) | |
| download | libguestfs-819cba54e6a19104de39ad1b153e5116d7028bca.tar.gz libguestfs-819cba54e6a19104de39ad1b153e5116d7028bca.tar.xz libguestfs-819cba54e6a19104de39ad1b153e5116d7028bca.zip | |
btrfs: Fix btrfs test so it works with btrfs-progs in Rawhide.
See: http://bugzilla.redhat.com/816346
| -rwxr-xr-x | tests/btrfs/test-btrfs-devices.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/btrfs/test-btrfs-devices.sh b/tests/btrfs/test-btrfs-devices.sh index 38ffcd51..fb6beeba 100755 --- a/tests/btrfs/test-btrfs-devices.sh +++ b/tests/btrfs/test-btrfs-devices.sh @@ -51,38 +51,38 @@ mount /dev/sda1 / mkdir /data1 txz-in ../data/filesanddirs-10M.tar.xz /data1 -# Uncommenting the next two lines shows filesystem errors. -# Reported upstream as RHBZ#816304. -#btrfs-filesystem-sync / -#dmesg +# In btrfs-progs 0.19, a test was added which prevents us from +# deleting the mount device (/dev/sda1) although that restriction +# isn't necessary. RHBZ#816346. If/when this is fixed, we could +# delete and re-add /dev/sda1 below. btrfs-device-add "/dev/sdc1 /dev/sdd1" / -btrfs-device-delete "/dev/sda1 /dev/sdb1" / -btrfs-device-add "/dev/sda1 /dev/sdb1" / +btrfs-device-delete "/dev/sdb1" / +btrfs-device-add "/dev/sdb1" / btrfs-device-delete "/dev/sdc1 /dev/sdd1" / mkdir /data2 txz-in ../data/filesanddirs-10M.tar.xz /data2 btrfs-device-add "/dev/sdc1 /dev/sdd1" / -btrfs-device-delete "/dev/sda1 /dev/sdb1" / -btrfs-device-add "/dev/sda1 /dev/sdb1" / +btrfs-device-delete "/dev/sdb1" / +btrfs-device-add "/dev/sdb1" / btrfs-device-delete "/dev/sdc1 /dev/sdd1" / mkdir /data3 txz-in ../data/filesanddirs-10M.tar.xz /data3 btrfs-device-add "/dev/sdc1 /dev/sdd1" / -btrfs-device-delete "/dev/sda1 /dev/sdb1" / -btrfs-device-add "/dev/sda1 /dev/sdb1" / +btrfs-device-delete "/dev/sdb1" / +btrfs-device-add "/dev/sdb1" / btrfs-device-delete "/dev/sdc1 /dev/sdd1" / mkdir /data4 txz-in ../data/filesanddirs-10M.tar.xz /data4 btrfs-device-add "/dev/sdc1 /dev/sdd1" / -btrfs-device-delete "/dev/sda1 /dev/sdb1" / -btrfs-device-add "/dev/sda1 /dev/sdb1" / +btrfs-device-delete "/dev/sdb1" / +btrfs-device-add "/dev/sdb1" / btrfs-device-delete "/dev/sdc1 /dev/sdd1" / EOF |