More test fixups

 - longer timeout for tiering_buffered, drop_alloc
 - migrate_fom_fs now works for xfs and ext4 (not btrfs)

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

6 files changed, 11 insertions, 9 deletions

diff --git a/tests/bcachefs/bcachefs-test-libs.sh b/tests/bcachefs/bcachefs-test-libs.sh
index fe9103c..aa47fd2 100644
--- a/tests/bcachefs/bcachefs-test-libs.sh
+++ b/tests/bcachefs/bcachefs-test-libs.sh
@@ -184,7 +184,7 @@ run_fio_randrw()
 
 run_basic_fio_test()
 {
-    set_watchdog 300
+    set_watchdog 600
     local devs=()
 
     for i in "$@"; do
diff --git a/tests/bcachefs/ec.ktest b/tests/bcachefs/ec.ktest
index 3f3e1c6..41cbfde 100644
--- a/tests/bcachefs/ec.ktest
+++ b/tests/bcachefs/ec.ktest
@@ -156,7 +156,7 @@ test_ec_mixed_tiers()
 
 test_ec_gc()
 {
-    set_watchdog 60
+    set_watchdog 1200
 
     bcachefs_antagonist
 
diff --git a/tests/bcachefs/perf.ktest b/tests/bcachefs/perf.ktest
index a3504ea..7d79db6 100644
--- a/tests/bcachefs/perf.ktest
+++ b/tests/bcachefs/perf.ktest
@@ -175,7 +175,7 @@ test_perf_all()
 
 test_perf_lookup()
 {
-    set_watchdog 600
+    set_watchdog 1200
     settle=0
 
     perf_mkfs
diff --git a/tests/bcachefs/replication.ktest b/tests/bcachefs/replication.ktest
index da14cb8..dabcf06 100644
--- a/tests/bcachefs/replication.ktest
+++ b/tests/bcachefs/replication.ktest
@@ -90,7 +90,7 @@ test_replicas()
 
 test_replicas_variable_buckets()
 {
-    set_watchdog 60
+    set_watchdog 600
     run_quiet "" bcachefs format -f			\
 	--replicas=2					\
 	--bucket=32k	/dev/sdb			\
diff --git a/tests/bcachefs/single_device.ktest b/tests/bcachefs/single_device.ktest
index 8bc047e..c2eb478 100644
--- a/tests/bcachefs/single_device.ktest
+++ b/tests/bcachefs/single_device.ktest
@@ -286,7 +286,7 @@ test_journal_resize()
 
 test_drop_alloc()
 {
-    set_watchdog 30
+    set_watchdog 90
     run_quiet "" bcachefs format -f /dev/sdb
     mount -t bcachefs /dev/sdb /mnt
 
@@ -1047,7 +1047,7 @@ disabled_test_swapfile()
 
 migrate_from_fs()
 {
-    set_watchdog 60
+    set_watchdog 180
     local fstype=$1
 
     if [[ $fstype = ext4 ]]; then
@@ -1069,7 +1069,7 @@ migrate_from_fs()
 	--encrypted				\
 	--no_passphrase				\
 	-F -f /mnt | tee /root/migratelog
-    offset=$(grep -w mount /root/migratelog|grep -oE 'sb=[[:digit:]]+'|sed -e 's/sb=//')
+    offset=$(grep -oE 'sb=[[:digit:]]+' /root/migratelog|head -n1|sed -e 's/sb=//')
 
     echo "Attempting to mount bcachefs filesystem with superblock offset $offset"
 
@@ -1094,13 +1094,13 @@ migrate_from_fs()
     fsck.$fstype -n /dev/sdb
 
     mount -t bcachefs -o sb=$offset /dev/sdb /mnt
-    rm /mnt/old_migrated_filesystem
     umount /mnt
 
     echo "Creating default superblock"
-
     bcachefs migrate-superblock -d /dev/sdb -o $offset
+
     mount -t bcachefs /dev/sdb /mnt
+    rm /mnt/old_migrated_filesystem
     umount /mnt
 }
 
diff --git a/tests/bcachefs/tier.ktest b/tests/bcachefs/tier.ktest
index 0e264d0..c8efe77 100644
--- a/tests/bcachefs/tier.ktest
+++ b/tests/bcachefs/tier.ktest
@@ -66,6 +66,8 @@ test_tiering_drop_alloc()
 
 test_tiering_buffered()
 {
+    set_watchdog 6000
+
     run_quiet "" bcachefs format		\
 	--block_size=4k				\
 	--label=ssd.ssd1 /dev/sdb		\