tests: add another sfdisk script tests

Addresses: https://github.com/karelzak/util-linux/issues/367
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/sfdisk/script-broken-1 b/tests/expected/sfdisk/script-broken-1
new file mode 100644 (file)
index 0000000..2dcc36b
--- /dev/null
+++ b/tests/expected/sfdisk/script-broken-1
@@ -0,0 +1,15 @@
+Checking that no-one is using this disk right now ... OK
+
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / <removed> bytes
+
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Script header accepted.
+>>> line 5: unsupported command
+
+New situation:
+Leaving.
+

diff --git a/tests/expected/sfdisk/script-broken-2 b/tests/expected/sfdisk/script-broken-2
new file mode 100644 (file)
index 0000000..2dcc36b
--- /dev/null
+++ b/tests/expected/sfdisk/script-broken-2
@@ -0,0 +1,15 @@
+Checking that no-one is using this disk right now ... OK
+
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / <removed> bytes
+
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Script header accepted.
+>>> line 5: unsupported command
+
+New situation:
+Leaving.
+

diff --git a/tests/expected/sfdisk/script-broken-3 b/tests/expected/sfdisk/script-broken-3
new file mode 100644 (file)
index 0000000..2dcc36b
--- /dev/null
+++ b/tests/expected/sfdisk/script-broken-3
@@ -0,0 +1,15 @@
+Checking that no-one is using this disk right now ... OK
+
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / <removed> bytes
+
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Script header accepted.
+>>> line 5: unsupported command
+
+New situation:
+Leaving.
+

diff --git a/tests/expected/sfdisk/script-broken-4 b/tests/expected/sfdisk/script-broken-4
new file mode 100644 (file)
index 0000000..2dcc36b
--- /dev/null
+++ b/tests/expected/sfdisk/script-broken-4
@@ -0,0 +1,15 @@
+Checking that no-one is using this disk right now ... OK
+
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / <removed> bytes
+
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Script header accepted.
+>>> line 5: unsupported command
+
+New situation:
+Leaving.
+

diff --git a/tests/expected/sfdisk/script-broken-5 b/tests/expected/sfdisk/script-broken-5
new file mode 100644 (file)
index 0000000..2dcc36b
--- /dev/null
+++ b/tests/expected/sfdisk/script-broken-5
@@ -0,0 +1,15 @@
+Checking that no-one is using this disk right now ... OK
+
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / <removed> bytes
+
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Script header accepted.
+>>> line 5: unsupported command
+
+New situation:
+Leaving.
+

diff --git a/tests/expected/sfdisk/script-quotes b/tests/expected/sfdisk/script-quotes
new file mode 100644 (file)
index 0000000..42d3bfd
--- /dev/null
+++ b/tests/expected/sfdisk/script-quotes
@@ -0,0 +1,40 @@
+Checking that no-one is using this disk right now ... OK
+
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / <removed> bytes
+
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Created a new <removed>.
+<removed>1: Created a new <removed>.
+<removed>2: Created a new <removed>.
+<removed>3: Created a new <removed>.
+<removed>4: Created a new <removed>.
+<removed>5: Done.
+
+New situation:
+
+Device             Start   End Sectors Size Type
+<removed>1   2048  8191    6144   3M Linux filesystem
+<removed>2   8192 14335    6144   3M Linux filesystem
+<removed>3  14336 20479    6144   3M Linux filesystem
+<removed>4  20480 26623    6144   3M Linux filesystem
+
+The partition table has been altered.
+Calling ioctl() to re-read partition table.
+Syncing disks.
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / <removed> bytes
+Disklabel type: gpt
+Disk identifier: <removed>
+
+Start   End Size UUID                                 Type             Name
+ 2048  8191   3M 4DD6948A-44F8-4E6C-8BDC-064F740704F8 Linux filesystem 
+ 8192 14335   3M 44B51DEF-5F04-465A-91AA-2889A62D8E49 Linux filesystem 
+14336 20479   3M 643E1D0D-BC02-4CED-B83B-86121062858F Linux filesystem 
+20480 26623   3M D2A29B0A-FDEE-40C3-9BAE-B9FA782C986C Linux filesystem 

diff --git a/tests/expected/sfdisk/script-separator b/tests/expected/sfdisk/script-separator
new file mode 100644 (file)
index 0000000..a09d476
--- /dev/null
+++ b/tests/expected/sfdisk/script-separator
@@ -0,0 +1,40 @@
+Checking that no-one is using this disk right now ... OK
+
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / <removed> bytes
+
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Created a new <removed>.
+<removed>1: Created a new <removed>.
+<removed>2: Created a new <removed>.
+<removed>3: Created a new <removed>.
+<removed>4: Created a new <removed>.
+<removed>5: Done.
+
+New situation:
+
+Device             Start    End Sectors Size Type
+<removed>1   2048   8191    6144   3M Linux filesystem
+<removed>2   8192  14335    6144   3M Linux root (x86)
+<removed>3  14336  20479    6144   3M Linux filesystem
+<removed>4  20480 102366   81887  40M Linux filesystem
+
+The partition table has been altered.
+Calling ioctl() to re-read partition table.
+Syncing disks.
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / <removed> bytes
+Disklabel type: gpt
+Disk identifier: <removed>
+
+Start    End Size UUID                                 Type             Name
+ 2048   8191   3M 4DD6948A-44F8-4E6C-8BDC-064F740704F8 Linux filesystem 
+ 8192  14335   3M 44B51DEF-5F04-465A-91AA-2889A62D8E49 Linux root (x86) 
+14336  20479   3M 643E1D0D-BC02-4CED-B83B-86121062858F Linux filesystem 
+20480 102366  40M D2A29B0A-FDEE-40C3-9BAE-B9FA782C986C Linux filesystem 

diff --git a/tests/ts/sfdisk/script b/tests/ts/sfdisk/script
index f9e59ca2485706b4d3e52fb46d07fdfb3f9008c0..d8450be63b14a6f73a8cc0a53e4622e72d12fda3 100755 (executable)
--- a/tests/ts/sfdisk/script
+++ b/tests/ts/sfdisk/script
@@ -48,5 +48,113 @@ $TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPU
 ts_fdisk_clean $TS_DEVICE
 ts_finalize_subtest
 
+ts_init_subtest "separator"
+$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+udevadm settle
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+unit: sectors
+label: gpt
+label-id: 3b8559db-33af-43e9-befc-c331d829b539
+
+${TS_DEVICE}1 : start=2048 size=6144   uuid=4dd6948a-44f8-4e6c-8bdc-064f740704f8
+${TS_DEVICE}2 : start=8192,size=6144,  uuid=44b51def-5f04-465a-91aa-2889a62d8e49 ,type=44479540-F297-41B2-9AF7-D131D5F0458A
+${TS_DEVICE}3 : start=14336 , size=6144 ,uuid=643e1d0d-bc02-4ced-b83b-86121062858f
+${TS_DEVICE}4 : start=20480; size=81887 ;     uuid=d2a29b0a-fdee-40c3-9bae-b9fa782c986c
+EOF
+udevadm settle
+$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+ts_fdisk_clean $TS_DEVICE
+ts_finalize_subtest
+
+
+ts_init_subtest "quotes"
+$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+udevadm settle
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+unit: sectors
+label: gpt
+label-id: 3b8559db-33af-43e9-befc-c331d829b539
+
+${TS_DEVICE}1 : start=2048  uuid="4dd6948a-44f8-4e6c-8bdc-064f740704f8" size=6144
+${TS_DEVICE}2 : start= 8192  uuid="44b51def-5f04-465a-91aa-2889a62d8e49" , size=6144
+${TS_DEVICE}3: start=14336 uuid="643e1d0d-bc02-4ced-b83b-86121062858f",size=6144
+${TS_DEVICE}4  : start=20480 uuid="d2a29b0a-fdee-40c3-9bae-b9fa782c986c",     size=6144
+EOF
+udevadm settle
+$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>&1
+ts_fdisk_clean $TS_DEVICE
+ts_finalize_subtest
+
+
+ts_init_subtest "broken-1"
+$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+udevadm settle
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+unit: sectors
+label: gpt
+label-id: 3b8559db-33af-43e9-befc-c331d829b539
+
+${TS_DEVICE}1 : start =2048  uuid="4dd6948a-44f8-4e6c-8bdc-064f740704f8" size=6144
+EOF
+ts_fdisk_clean $TS_DEVICE
+ts_finalize_subtest
+
+
+ts_init_subtest "broken-2"
+$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+udevadm settle
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+unit: sectors
+label: gpt
+label-id: 3b8559db-33af-43e9-befc-c331d829b539
+
+${TS_DEVICE}1 : start=2048uuid="4dd6948a-44f8-4e6c-8bdc-064f740704f8" size=6144
+EOF
+ts_fdisk_clean $TS_DEVICE
+ts_finalize_subtest
+
+
+ts_init_subtest "broken-3"
+$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+udevadm settle
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+unit: sectors
+label: gpt
+label-id: 3b8559db-33af-43e9-befc-c331d829b539
+
+${TS_DEVICE}1 : start=2048 uuid=,"4dd6948a-44f8-4e6c-8bdc-064f740704f8" size=6144
+EOF
+ts_fdisk_clean $TS_DEVICE
+ts_finalize_subtest
+
+
+ts_init_subtest "broken-4"
+$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+udevadm settle
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+unit: sectors
+label: gpt
+label-id: 3b8559db-33af-43e9-befc-c331d829b539
+
+${TS_DEVICE}1 : start=2048 uuid="4dd6948a-44f8-4e6c-8bdc-064f740704f8 size=6144
+EOF
+ts_fdisk_clean $TS_DEVICE
+ts_finalize_subtest
+
+
+ts_init_subtest "broken-5"
+$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+udevadm settle
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+unit: sectors
+label: gpt
+label-id: 3b8559db-33af-43e9-befc-c331d829b539
+
+${TS_DEVICE}1 : start=2048 uuid=4dd6948a-44f8-4e6c-8bdc-064f740704f8" size=6144
+EOF
+ts_fdisk_clean $TS_DEVICE
+ts_finalize_subtest
+
+udevadm settle
 rmmod scsi_debug
 ts_finalize