Adding upstream version 2.33.1.upstream/2.33.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 252 insertions, 0 deletions

diff --git a/tests/expected/lsblk/lsblk-simple-lvm-basic b/tests/expected/lsblk/lsblk-simple-lvm-basic
new file mode 100644
index 0000000..0413be7
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-lvm-basic
@@ -0,0 +1,22 @@
+NAME                      KNAME     MAJ:MIN RM   SIZE TYPE MOUNTPOINT
+loop0                     loop0       7:0    0    10M loop 
+`-vg_foo.4059-lv_foo.4059 dm-0      253:0    0    32M lvm  
+loop1                     loop1       7:1    0    10M loop 
+`-vg_foo.4059-lv_foo.4059 dm-0      253:0    0    32M lvm  
+loop2                     loop2       7:2    0    10M loop 
+`-vg_foo.4059-lv_foo.4059 dm-0      253:0    0    32M lvm  
+loop3                     loop3       7:3    0    10M loop 
+`-vg_foo.4059-lv_foo.4059 dm-0      253:0    0    32M lvm  
+sda                       sda         8:0    0 223.6G disk 
+|-sda1                    sda1        8:1    0   200M part /boot/efi
+|-sda2                    sda2        8:2    0   200M part /boot
+|-sda3                    sda3        8:3    0 130.3G part 
+|-sda4                    sda4        8:4    0    50G part /
+|-sda5                    sda5        8:5    0  35.1G part 
+`-sda6                    sda6        8:6    0   7.8G part 
+sdb                       sdb         8:16   0  74.5G disk 
+`-sdb1                    sdb1        8:17   0  74.5G part /home/archive
+nvme0n1                   nvme0n1   259:0    0 223.6G disk 
+|-nvme0n1p1               nvme0n1p1 259:1    0   7.8G part 
+|-nvme0n1p2               nvme0n1p2 259:2    0   200G part /home
+`-nvme0n1p3               nvme0n1p3 259:3    0  15.8G part /home/test
diff --git a/tests/expected/lsblk/lsblk-simple-lvm-discard b/tests/expected/lsblk/lsblk-simple-lvm-discard
new file mode 100644
index 0000000..4eb6763
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-lvm-discard
@@ -0,0 +1,22 @@
+NAME                      DISC-ALN DISC-GRAN DISC-MAX DISC-ZERO
+loop0                            0        4K       4G         0
+`-vg_foo.4059-lv_foo.4059        0        4K       4G         0
+loop1                            0        4K       4G         0
+`-vg_foo.4059-lv_foo.4059        0        4K       4G         0
+loop2                            0        4K       4G         0
+`-vg_foo.4059-lv_foo.4059        0        4K       4G         0
+loop3                            0        4K       4G         0
+`-vg_foo.4059-lv_foo.4059        0        4K       4G         0
+sda                              0      512B       2G         0
+|-sda1                           0      512B       2G         0
+|-sda2                           0      512B       2G         0
+|-sda3                           0      512B       2G         0
+|-sda4                           0      512B       2G         0
+|-sda5                           0      512B       2G         0
+`-sda6                           0      512B       2G         0
+sdb                              0        0B       0B         0
+`-sdb1                           0        0B       0B         0
+nvme0n1                          0      512B       2T         0
+|-nvme0n1p1                      0      512B       2T         0
+|-nvme0n1p2                      0      512B       2T         0
+`-nvme0n1p3                      0      512B       2T         0
diff --git a/tests/expected/lsblk/lsblk-simple-lvm-rw b/tests/expected/lsblk/lsblk-simple-lvm-rw
new file mode 100644
index 0000000..8dcf580
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-lvm-rw
@@ -0,0 +1,22 @@
+NAME                       RA WSAME
+loop0                     128    0B
+`-vg_foo.4059-lv_foo.4059 128    0B
+loop1                     128    0B
+`-vg_foo.4059-lv_foo.4059 128    0B
+loop2                     128    0B
+`-vg_foo.4059-lv_foo.4059 128    0B
+loop3                     128    0B
+`-vg_foo.4059-lv_foo.4059 128    0B
+sda                       128    0B
+|-sda1                    128    0B
+|-sda2                    128    0B
+|-sda3                    128    0B
+|-sda4                    128    0B
+|-sda5                    128    0B
+`-sda6                    128    0B
+sdb                       128    0B
+`-sdb1                    128    0B
+nvme0n1                   128    0B
+|-nvme0n1p1               128    0B
+|-nvme0n1p2               128    0B
+`-nvme0n1p3               128    0B
diff --git a/tests/expected/lsblk/lsblk-simple-lvm-state b/tests/expected/lsblk/lsblk-simple-lvm-state
new file mode 100644
index 0000000..000ed44
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-lvm-state
@@ -0,0 +1,22 @@
+NAME                      RO RM HOTPLUG RAND STATE   ROTA TYPE PKNAME  SCHED
+loop0                      0  0       0    0            1 loop         mq-deadline
+`-vg_foo.4059-lv_foo.4059  0  0       0    0 running    1 lvm  loop0   
+loop1                      0  0       0    0            1 loop         mq-deadline
+`-vg_foo.4059-lv_foo.4059  0  0       0    0 running    1 lvm  loop1   
+loop2                      0  0       0    0            1 loop         mq-deadline
+`-vg_foo.4059-lv_foo.4059  0  0       0    0 running    1 lvm  loop2   
+loop3                      0  0       0    0            1 loop         mq-deadline
+`-vg_foo.4059-lv_foo.4059  0  0       0    0 running    1 lvm  loop3   
+sda                        0  0       0    0 running    0 disk         cfq
+|-sda1                     0  0       0    0            0 part sda     cfq
+|-sda2                     0  0       0    0            0 part sda     cfq
+|-sda3                     0  0       0    0            0 part sda     cfq
+|-sda4                     0  0       0    0            0 part sda     cfq
+|-sda5                     0  0       0    0            0 part sda     cfq
+`-sda6                     0  0       0    0            0 part sda     cfq
+sdb                        0  0       0    1 running    1 disk         cfq
+`-sdb1                     0  0       0    1            1 part sdb     cfq
+nvme0n1                    0  0       0    0 live       0 disk         none
+|-nvme0n1p1                0  0       0    0            0 part nvme0n1 none
+|-nvme0n1p2                0  0       0    0            0 part nvme0n1 none
+`-nvme0n1p3                0  0       0    0            0 part nvme0n1 none
diff --git a/tests/expected/lsblk/lsblk-simple-lvm-topo b/tests/expected/lsblk/lsblk-simple-lvm-topo
new file mode 100644
index 0000000..3937da3
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-lvm-topo
@@ -0,0 +1,22 @@
+NAME                        SIZE ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC RQ-SIZE
+loop0                        10M         0    512      0     512     512     256
+`-vg_foo.4059-lv_foo.4059    32M         0    512      0     512     512     128
+loop1                        10M         0    512      0     512     512     256
+`-vg_foo.4059-lv_foo.4059    32M         0    512      0     512     512     128
+loop2                        10M         0    512      0     512     512     256
+`-vg_foo.4059-lv_foo.4059    32M         0    512      0     512     512     128
+loop3                        10M         0    512      0     512     512     256
+`-vg_foo.4059-lv_foo.4059    32M         0    512      0     512     512     128
+sda                       223.6G         0    512      0     512     512     128
+|-sda1                      200M         0    512      0     512     512     128
+|-sda2                      200M         0    512      0     512     512     128
+|-sda3                    130.3G         0    512      0     512     512     128
+|-sda4                       50G         0    512      0     512     512     128
+|-sda5                     35.1G         0    512      0     512     512     128
+`-sda6                      7.8G         0    512      0     512     512     128
+sdb                        74.5G         0    512      0     512     512     128
+`-sdb1                     74.5G         0    512      0     512     512     128
+nvme0n1                   223.6G         0    512      0     512     512    1023
+|-nvme0n1p1                 7.8G         0    512      0     512     512    1023
+|-nvme0n1p2                 200G         0    512      0     512     512    1023
+`-nvme0n1p3                15.8G         0    512      0     512     512    1023
diff --git a/tests/expected/lsblk/lsblk-simple-lvm-vendor b/tests/expected/lsblk/lsblk-simple-lvm-vendor
new file mode 100644
index 0000000..591c703
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-lvm-vendor
@@ -0,0 +1,22 @@
+NAME                      MODEL                                    VENDOR    REV
+loop0                                                                           
+`-vg_foo.4059-lv_foo.4059                                                       
+loop1                                                                           
+`-vg_foo.4059-lv_foo.4059                                                       
+loop2                                                                           
+`-vg_foo.4059-lv_foo.4059                                                       
+loop3                                                                           
+`-vg_foo.4059-lv_foo.4059                                                       
+sda                       KINGSTON SH103S3                         ATA      BBF0
+|-sda1                                                                          
+|-sda2                                                                          
+|-sda3                                                                          
+|-sda4                                                                          
+|-sda5                                                                          
+`-sda6                                                                          
+sdb                       WDC WD800JD-00MS                         ATA      1E01
+`-sdb1                                                                          
+nvme0n1                   KINGSTON SKC1000240G                                  
+|-nvme0n1p1                                                                     
+|-nvme0n1p2                                                                     
+`-nvme0n1p3                                                                     
diff --git a/tests/expected/lsblk/lsblk-simple-lvm-zone b/tests/expected/lsblk/lsblk-simple-lvm-zone
new file mode 100644
index 0000000..256a208
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-lvm-zone
@@ -0,0 +1,22 @@
+NAME                      ZONED
+loop0                     none
+`-vg_foo.4059-lv_foo.4059 none
+loop1                     none
+`-vg_foo.4059-lv_foo.4059 none
+loop2                     none
+`-vg_foo.4059-lv_foo.4059 none
+loop3                     none
+`-vg_foo.4059-lv_foo.4059 none
+sda                       none
+|-sda1                    none
+|-sda2                    none
+|-sda3                    none
+|-sda4                    none
+|-sda5                    none
+`-sda6                    none
+sdb                       none
+`-sdb1                    none
+nvme0n1                   none
+|-nvme0n1p1               none
+|-nvme0n1p2               none
+`-nvme0n1p3               none
diff --git a/tests/expected/lsblk/lsblk-simple-nvme-basic b/tests/expected/lsblk/lsblk-simple-nvme-basic
new file mode 100644
index 0000000..c3f4835
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-nvme-basic
@@ -0,0 +1,14 @@
+NAME        KNAME     MAJ:MIN RM   SIZE TYPE MOUNTPOINT
+sda         sda         8:0    0 223.6G disk 
+|-sda1      sda1        8:1    0   200M part /boot/efi
+|-sda2      sda2        8:2    0   200M part /boot
+|-sda3      sda3        8:3    0 130.3G part 
+|-sda4      sda4        8:4    0    50G part /
+|-sda5      sda5        8:5    0  35.1G part 
+`-sda6      sda6        8:6    0   7.8G part 
+sdb         sdb         8:16   0  74.5G disk 
+`-sdb1      sdb1        8:17   0  74.5G part /home/archive
+nvme0n1     nvme0n1   259:0    0 223.6G disk 
+|-nvme0n1p1 nvme0n1p1 259:1    0   7.8G part 
+|-nvme0n1p2 nvme0n1p2 259:2    0   200G part /home
+`-nvme0n1p3 nvme0n1p3 259:3    0  15.8G part /home/test
diff --git a/tests/expected/lsblk/lsblk-simple-nvme-discard b/tests/expected/lsblk/lsblk-simple-nvme-discard
new file mode 100644
index 0000000..4e03c7c
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-nvme-discard
@@ -0,0 +1,14 @@
+NAME        DISC-ALN DISC-GRAN DISC-MAX DISC-ZERO
+sda                0      512B       2G         0
+|-sda1             0      512B       2G         0
+|-sda2             0      512B       2G         0
+|-sda3             0      512B       2G         0
+|-sda4             0      512B       2G         0
+|-sda5             0      512B       2G         0
+`-sda6             0      512B       2G         0
+sdb                0        0B       0B         0
+`-sdb1             0        0B       0B         0
+nvme0n1            0      512B       2T         0
+|-nvme0n1p1        0      512B       2T         0
+|-nvme0n1p2        0      512B       2T         0
+`-nvme0n1p3        0      512B       2T         0
diff --git a/tests/expected/lsblk/lsblk-simple-nvme-rw b/tests/expected/lsblk/lsblk-simple-nvme-rw
new file mode 100644
index 0000000..a5eb877
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-nvme-rw
@@ -0,0 +1,14 @@
+NAME         RA WSAME
+sda         128    0B
+|-sda1      128    0B
+|-sda2      128    0B
+|-sda3      128    0B
+|-sda4      128    0B
+|-sda5      128    0B
+`-sda6      128    0B
+sdb         128    0B
+`-sdb1      128    0B
+nvme0n1     128    0B
+|-nvme0n1p1 128    0B
+|-nvme0n1p2 128    0B
+`-nvme0n1p3 128    0B
diff --git a/tests/expected/lsblk/lsblk-simple-nvme-state b/tests/expected/lsblk/lsblk-simple-nvme-state
new file mode 100644
index 0000000..1efdf14
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-nvme-state
@@ -0,0 +1,14 @@
+NAME        RO RM HOTPLUG RAND STATE   ROTA TYPE PKNAME  SCHED
+sda          0  0       0    0 running    0 disk         cfq
+|-sda1       0  0       0    0            0 part sda     cfq
+|-sda2       0  0       0    0            0 part sda     cfq
+|-sda3       0  0       0    0            0 part sda     cfq
+|-sda4       0  0       0    0            0 part sda     cfq
+|-sda5       0  0       0    0            0 part sda     cfq
+`-sda6       0  0       0    0            0 part sda     cfq
+sdb          0  0       0    1 running    1 disk         cfq
+`-sdb1       0  0       0    1            1 part sdb     cfq
+nvme0n1      0  0       0    0 live       0 disk         none
+|-nvme0n1p1  0  0       0    0            0 part nvme0n1 none
+|-nvme0n1p2  0  0       0    0            0 part nvme0n1 none
+`-nvme0n1p3  0  0       0    0            0 part nvme0n1 none
diff --git a/tests/expected/lsblk/lsblk-simple-nvme-topo b/tests/expected/lsblk/lsblk-simple-nvme-topo
new file mode 100644
index 0000000..87b0fa5
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-nvme-topo
@@ -0,0 +1,14 @@
+NAME          SIZE ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC RQ-SIZE
+sda         223.6G         0    512      0     512     512     128
+|-sda1        200M         0    512      0     512     512     128
+|-sda2        200M         0    512      0     512     512     128
+|-sda3      130.3G         0    512      0     512     512     128
+|-sda4         50G         0    512      0     512     512     128
+|-sda5       35.1G         0    512      0     512     512     128
+`-sda6        7.8G         0    512      0     512     512     128
+sdb          74.5G         0    512      0     512     512     128
+`-sdb1       74.5G         0    512      0     512     512     128
+nvme0n1     223.6G         0    512      0     512     512    1023
+|-nvme0n1p1   7.8G         0    512      0     512     512    1023
+|-nvme0n1p2   200G         0    512      0     512     512    1023
+`-nvme0n1p3  15.8G         0    512      0     512     512    1023
diff --git a/tests/expected/lsblk/lsblk-simple-nvme-vendor b/tests/expected/lsblk/lsblk-simple-nvme-vendor
new file mode 100644
index 0000000..69e972a
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-nvme-vendor
@@ -0,0 +1,14 @@
+NAME        MODEL                                    VENDOR    REV
+sda         KINGSTON SH103S3                         ATA      BBF0
+|-sda1                                                            
+|-sda2                                                            
+|-sda3                                                            
+|-sda4                                                            
+|-sda5                                                            
+`-sda6                                                            
+sdb         WDC WD800JD-00MS                         ATA      1E01
+`-sdb1                                                            
+nvme0n1     KINGSTON SKC1000240G                                  
+|-nvme0n1p1                                                       
+|-nvme0n1p2                                                       
+`-nvme0n1p3                                                       
diff --git a/tests/expected/lsblk/lsblk-simple-nvme-zone b/tests/expected/lsblk/lsblk-simple-nvme-zone
new file mode 100644
index 0000000..bba9ba9
--- /dev/null
+++ b/tests/expected/lsblk/lsblk-simple-nvme-zone
@@ -0,0 +1,14 @@
+NAME        ZONED
+sda         none
+|-sda1      none
+|-sda2      none
+|-sda3      none
+|-sda4      none
+|-sda5      none
+`-sda6      none
+sdb         none
+`-sdb1      none
+nvme0n1     none
+|-nvme0n1p1 none
+|-nvme0n1p2 none
+`-nvme0n1p3 none