Skip to content

Commit

Permalink
Quiet tests right the hell down
Browse files Browse the repository at this point in the history
I want to see the tests passed, not that an LV was created.
  • Loading branch information
mpalmer committed Oct 10, 2014
1 parent 1ef3703 commit 8cc352f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions test/00simple_local_sync
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ trap "lvremove -f $VG/__lvmsynctest_src || true;
lvremove -f $VG/__lvmsynctest_dest || true;
lvremove -f $VG/__lvmsynctest_snap || true" EXIT

lvcreate -l 5 -n __lvmsynctest_src $VG
lvcreate -l 5 -n __lvmsynctest_dest $VG
lvcreate -l 5 -n __lvmsynctest_src $VG >/dev/null
lvcreate -l 5 -n __lvmsynctest_dest $VG >/dev/null

# Fill src with gibberish
dd if=/dev/urandom of=/dev/$VG/__lvmsynctest_src bs=1M || true
dd if=/dev/urandom of=/dev/$VG/__lvmsynctest_src bs=1M >/dev/null 2>&1 || true

# Snapshot
lvcreate --snapshot $VG/__lvmsynctest_src -l 5 -n __lvmsynctest_snap
lvcreate --snapshot $VG/__lvmsynctest_src -l 5 -n __lvmsynctest_snap >/dev/null

# Initial copy
dd if=/dev/$VG/__lvmsynctest_src of=/dev/$VG/__lvmsynctest_dest bs=1M
dd if=/dev/$VG/__lvmsynctest_src of=/dev/$VG/__lvmsynctest_dest bs=1M >/dev/null 2>&1

# Write in some gibberish at intervals across the LV
i=0
Expand All @@ -21,16 +21,16 @@ while dd if=/dev/urandom of=/dev/$VG/__lvmsynctest_src bs=512 count=1 seek=$(($i
done

# Now lvmsync!
$LVMSYNC /dev/$VG/__lvmsynctest_snap /dev/$VG/__lvmsynctest_dest || true
$LVMSYNC /dev/$VG/__lvmsynctest_snap /dev/$VG/__lvmsynctest_dest 2>/dev/null || true

# Verify that our source and dest are now equal
SRCSUM="$(md5sum </dev/$VG/__lvmsynctest_src)"
DESTSUM="$(md5sum </dev/$VG/__lvmsynctest_dest)"

# Cleanup
lvremove -f $VG/__lvmsynctest_snap
lvremove -f $VG/__lvmsynctest_dest
lvremove -f $VG/__lvmsynctest_src
lvremove -f $VG/__lvmsynctest_snap >/dev/null
lvremove -f $VG/__lvmsynctest_dest >/dev/null
lvremove -f $VG/__lvmsynctest_src >/dev/null

trap "" EXIT

Expand Down
20 changes: 10 additions & 10 deletions test/05sync_via_snapshot_file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ trap "lvremove -f $VG/__lvmsynctest_src || true;
lvremove -f $VG/__lvmsynctest_snap || true;
rm -f $HERE/,,snapshot_data_file || true" EXIT

lvcreate -l 5 -n __lvmsynctest_src $VG
lvcreate -l 5 -n __lvmsynctest_dest $VG
lvcreate -l 5 -n __lvmsynctest_src $VG >/dev/null
lvcreate -l 5 -n __lvmsynctest_dest $VG >/dev/null

# Fill src with gibberish
dd if=/dev/urandom of=/dev/$VG/__lvmsynctest_src bs=1M || true
dd if=/dev/urandom of=/dev/$VG/__lvmsynctest_src bs=1M >/dev/null 2>&1 || true

# Snapshot
lvcreate --snapshot $VG/__lvmsynctest_src -l 5 -n __lvmsynctest_snap
lvcreate --snapshot $VG/__lvmsynctest_src -l 5 -n __lvmsynctest_snap >/dev/null

# Initial copy
dd if=/dev/$VG/__lvmsynctest_src of=/dev/$VG/__lvmsynctest_dest bs=1M
dd if=/dev/$VG/__lvmsynctest_src of=/dev/$VG/__lvmsynctest_dest bs=1M >/dev/null 2>&1

# Write in some gibberish at intervals across the LV
i=0
Expand All @@ -22,19 +22,19 @@ while dd if=/dev/urandom of=/dev/$VG/__lvmsynctest_src bs=512 count=1 seek=$(($i
done

# Now lvmsync -- dump to a file
$LVMSYNC /dev/$VG/__lvmsynctest_snap /dev/$VG/__lvmsynctest_dest --stdout >$HERE/,,snapshot_data_file || true
$LVMSYNC /dev/$VG/__lvmsynctest_snap /dev/$VG/__lvmsynctest_dest --stdout >$HERE/,,snapshot_data_file 2>/dev/null || true

# Apply from the file
$LVMSYNC --apply $HERE/,,snapshot_data_file /dev/$VG/__lvmsynctest_dest
$LVMSYNC --apply $HERE/,,snapshot_data_file /dev/$VG/__lvmsynctest_dest 2>/dev/null || true

# Verify that our source and dest are now equal
SRCSUM="$(md5sum </dev/$VG/__lvmsynctest_src)"
DESTSUM="$(md5sum </dev/$VG/__lvmsynctest_dest)"

# Cleanup
lvremove -f $VG/__lvmsynctest_snap
lvremove -f $VG/__lvmsynctest_dest
lvremove -f $VG/__lvmsynctest_src
lvremove -f $VG/__lvmsynctest_snap >/dev/null >/dev/null
lvremove -f $VG/__lvmsynctest_dest >/dev/null >/dev/null
lvremove -f $VG/__lvmsynctest_src >/dev/null >/dev/null
rm -f $HERE/,,snapshot_data_file

trap "" EXIT
Expand Down

0 comments on commit 8cc352f

Please sign in to comment.