tests: add remaining stderr outputs

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
index ebf0784158a20c7ef78d33a56255e8e03b55d063..3d912ed5dbce56a4a9a4b8a7357f09484b1155b2 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
+++ b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
@@ -6,8 +6,6 @@ Created a new <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
 Created a new <removed>.
 Requested partition: <partno=3,start=5000,size=2048>
-Sector 5000 already used.
-sample-fdisk-mkpart-fullspec: failed to add #4 partition
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap.err b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap.err
new file mode 100644 (file)
index 0000000..bd62a9b
--- /dev/null
+++ b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap.err
@@ -0,0 +1,2 @@
+Sector 5000 already used.
+sample-fdisk-mkpart-fullspec: failed to add #4 partition

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-logical b/tests/expected/libfdisk/mkpart-full-mbr-err-logical
index 6d48f487a62b0a096faac34ecb9143f528b666cf..a08070ea3f9cca0b69e7bfd153fed926275141d4 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-logical
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-logical
@@ -11,7 +11,6 @@ Requested partition: <partno=4,start=10240,size=2048>
 Adding logical partition 5
 Created a new <removed>.
 Requested partition: <partno=5,start=4096,size=2048>
-sample-fdisk-mkpart-fullspec: failed to add #6 partition
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-logical.err b/tests/expected/libfdisk/mkpart-full-mbr-err-logical.err
new file mode 100644 (file)
index 0000000..014b316
--- /dev/null
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-logical.err
@@ -0,0 +1 @@
+sample-fdisk-mkpart-fullspec: failed to add #6 partition

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
index a79c5800a16297b7f1ef5fe8b4951df5e64245e7..3a1cd636cdc3c4fb4afcc1740198d9a6c539d41e 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
@@ -4,8 +4,6 @@ Created a new <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
 Created a new <removed>.
 Requested partition: <partno=2,start=4096,size=2048>
-Start sector 4096 out of range.
-sample-fdisk-mkpart-fullspec: failed to add #3 partition
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace.err b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace.err
new file mode 100644 (file)
index 0000000..7e44232
--- /dev/null
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace.err
@@ -0,0 +1,2 @@
+Start sector 4096 out of range.
+sample-fdisk-mkpart-fullspec: failed to add #3 partition

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-primary b/tests/expected/libfdisk/mkpart-full-mbr-err-primary
index 93edf2b0748ef282c60219d8d8129db8f5c588a3..57fcc5c3f431fd525661e33c65b9f51fa3702eab 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-primary
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-primary
@@ -4,8 +4,6 @@ Created a new <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
 Created a new <removed>.
 Requested partition: <partno=6,start=6144,size=2048>
-Extended partition does not exists. Failed to add logical partition.
-sample-fdisk-mkpart-fullspec: failed to add #7 partition
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-primary.err b/tests/expected/libfdisk/mkpart-full-mbr-err-primary.err
new file mode 100644 (file)
index 0000000..59e42e1
--- /dev/null
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-primary.err
@@ -0,0 +1,2 @@
+Extended partition does not exists. Failed to add logical partition.
+sample-fdisk-mkpart-fullspec: failed to add #7 partition

diff --git a/tests/ts/libfdisk/mkpart-full b/tests/ts/libfdisk/mkpart-full
index b08891d9f1eb6495fe246b48487e8b9f55ce25c5..05b2b4793e3b0aa61fd1c7add3bcd553f50c0305 100755 (executable)
--- a/tests/ts/libfdisk/mkpart-full
+++ b/tests/ts/libfdisk/mkpart-full
@@ -31,7 +31,7 @@ ts_check_test_command "$TS_CMD_WIPEFS"
 TEST_IMAGE_NAME=$(ts_image_init 15)
 
 ts_init_subtest "mbr-primary"
-ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,4096,2048 \
        3,6144,2048 \
@@ -45,7 +45,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 
 ts_init_subtest "mbr-primary-nopartno"
-ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
+ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
        -,2048,2048 \
        -,4096,2048 \
        -,6144,2048 \
@@ -59,7 +59,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ## no extended but partno > 4 requested
 ts_init_subtest "mbr-err-primary"
-ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,4096,2048 \
        7,6144,2048 \
@@ -72,7 +72,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ## no extended but partno > 4 requested
 ts_init_subtest "mbr-err-nospace"
-ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,4096,2048 \
        3,4096,2048 \
@@ -85,7 +85,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 
 ts_init_subtest "mbr-logical"
-ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,4096,2048 \
        3,6144,2048 \
@@ -101,7 +101,7 @@ ts_finalize_subtest
 $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ts_init_subtest "mbr-nopartno"
-ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
+ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
        -,2048,2048 \
        -,4096,2048 \
        -,6144,2048 \
@@ -118,7 +118,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ### 6th partition (logical) out of extended
 ts_init_subtest "mbr-err-logical"
-ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,4096,2048 \
        3,6144,2048 \
@@ -134,7 +134,7 @@ ts_finalize_subtest
 $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ts_init_subtest "mbr-space-gap"
-ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,6144,2048 \
        3,8192,2048 \
@@ -146,7 +146,7 @@ ts_finalize_subtest
 $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ts_init_subtest "gpt"
-ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,4096,2048 \
        3,6144,2048 \
@@ -162,7 +162,7 @@ ts_finalize_subtest
 $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ts_init_subtest "gpt-nopartno"
-ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} -- \
+ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} -- \
        -,2048,2048 \
        -,4096,2048 \
        -,6144,2048 \
@@ -179,7 +179,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ### 4th partition overlap 4th and 5th
 ts_init_subtest "gpt-err-overlap"
-ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,4096,2048 \
        3,6144,2048 \
@@ -195,7 +195,7 @@ ts_finalize_subtest
 $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ts_init_subtest "gpt-partno-gap"
-ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,4096,2048 \
        4,6144,2048 \
@@ -211,7 +211,7 @@ ts_finalize_subtest
 $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
 
 ts_init_subtest "gpt-space-gap"
-ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
+ts_run $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
        1,2048,2048 \
        2,6144,2048 \
        3,8192,2048 \
@@ -222,6 +222,4 @@ $TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_fdisk_clean ${TEST_IMAGE_NAME}
 ts_finalize_subtest
 
-
-
 ts_finalize