From: Davidlohr Bueso <dave@gnu.org>
To: Karel Zak <kzak@redhat.com>, Petr Uzel <petr.uzel@suse.cz>
Cc: util-linux <util-linux@vger.kernel.org>
Subject: [PATCH 4/9] fdisk: tests: update oddinput test
Date: Sun, 17 Jun 2012 18:10:11 +0200 [thread overview]
Message-ID: <1339949411.2668.16.camel@offbook> (raw)
From: Davidlohr Bueso <dave@gnu.org>
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>
---
tests/expected/fdisk/oddinput | 1 +
tests/ts/fdisk/oddinput | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/expected/fdisk/oddinput b/tests/expected/fdisk/oddinput
index c812caa..d90866b 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 f250c91..799eca0 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
--
1.7.4.1
reply other threads:[~2012-06-17 16:10 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339949411.2668.16.camel@offbook \
--to=dave@gnu.org \
--cc=kzak@redhat.com \
--cc=petr.uzel@suse.cz \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).