summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavidlohr Bueso2012-06-17 18:10:11 +0200
committerKarel Zak2012-06-21 08:04:31 +0200
commitff680b36e9ab940ff4686373addea1b094336ffe (patch)
treee3096d75387d9703028816faaa30d1055c9d5745 /tests
parentfdisk: API: add mbr (diff)
downloadkernel-qcow2-util-linux-ff680b36e9ab940ff4686373addea1b094336ffe.tar.gz
kernel-qcow2-util-linux-ff680b36e9ab940ff4686373addea1b094336ffe.tar.xz
kernel-qcow2-util-linux-ff680b36e9ab940ff4686373addea1b094336ffe.zip
fdisk: tests: update oddinput test
Adding mbr to the API breaks this test, specifically when reading the first 512 bytes of the MBR, update the expected output for oddinput.toosmall. Also let the test create and remove the test file instead of having it in the expected directory. Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected/fdisk/oddinput1
-rwxr-xr-xtests/ts/fdisk/oddinput5
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/expected/fdisk/oddinput b/tests/expected/fdisk/oddinput
index c812caafe..d90866bac 100644
--- a/tests/expected/fdisk/oddinput
+++ b/tests/expected/fdisk/oddinput
@@ -11,3 +11,4 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes
Nonexistant file
lt-fdisk: unable to open _a_file_that_does_not_exist_: No such file or directory
Too small file
+lt-fdisk: unable to open oddinput.toosmall: Success
diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput
index f250c91d0..799eca054 100755
--- a/tests/ts/fdisk/oddinput
+++ b/tests/ts/fdisk/oddinput
@@ -34,6 +34,7 @@ ts_log "Nonexistant file" # this originally does absolutely nothing
$TS_CMD_FDISK -c=dos -u=cylinders -l _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>&1
ts_log "Too small file" # same here
-$TS_CMD_FDISK -c=dos -u=cylinders -l $TS_TOPDIR/expected/fdisk/oddinput.toosmall >> $TS_OUTPUT 2>&1
-
+echo "This file is too small" >> oddinput.toosmall
+$TS_CMD_FDISK -c=dos -u=cylinders -l oddinput.toosmall >> $TS_OUTPUT 2>&1
+rm oddinput.toosmall
ts_finalize