diff --git a/tests/fixtures/centos-7.7/lsblk-allcols.json b/tests/fixtures/centos-7.7/lsblk-allcols.json new file mode 100644 index 00000000..408dfc2c --- /dev/null +++ b/tests/fixtures/centos-7.7/lsblk-allcols.json @@ -0,0 +1 @@ +[{"name": "sda", "maj_min": "8:0", "rm": false, "size": "20G", "ro": false, "type": "disk", "mountpoint": null, "kname": "sda", "fstype": null, "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 4096, "model": "VMware Virtual S", "serial": null, "state": "running", "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "deadline", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "32M", "wwn": null, "rand": true, "pkname": null, "hctl": "0:0:0:0", "tran": "spi", "rev": "1.0", "vendor": "VMware,"}, {"name": "sda1", "maj_min": "8:1", "rm": false, "size": "1G", "ro": false, "type": "part", "mountpoint": "/boot", "kname": "sda1", "fstype": "xfs", "label": null, "uuid": "05d927bb-5875-49e3-ada1-7f46cb31c932", "partlabel": null, "partuuid": null, "ra": 4096, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "deadline", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "32M", "wwn": null, "rand": true, "pkname": "sda", "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "sda2", "maj_min": "8:2", "rm": false, "size": "19G", "ro": false, "type": "part", "mountpoint": null, "kname": "sda2", "fstype": "LVM2_member", "label": null, "uuid": "3klkIj-w1qk-DkJi-0XBJ-y3o7-i2Ac-vHqWBM", "partlabel": null, "partuuid": null, "ra": 4096, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "deadline", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "32M", "wwn": null, "rand": true, "pkname": "sda", "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "centos-root", "maj_min": "253:0", "rm": false, "size": "17G", "ro": false, "type": "lvm", "mountpoint": "/", "kname": "dm-0", "fstype": "xfs", "label": null, "uuid": "07d718ef-950c-4e5b-98e0-42a1147b77d9", "partlabel": null, "partuuid": null, "ra": 4096, "model": null, "serial": null, "state": "running", "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": null, "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "32M", "wwn": null, "rand": false, "pkname": "sda2", "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "centos-swap", "maj_min": "253:1", "rm": false, "size": "2G", "ro": false, "type": "lvm", "mountpoint": "[SWAP]", "kname": "dm-1", "fstype": "swap", "label": null, "uuid": "615eb89d-bcbf-46ad-80e3-c483ef5c931f", "partlabel": null, "partuuid": null, "ra": 4096, "model": null, "serial": null, "state": "running", "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": null, "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "32M", "wwn": null, "rand": false, "pkname": "sda2", "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "sr0", "maj_min": "11:0", "rm": true, "size": "1024M", "ro": false, "type": "rom", "mountpoint": null, "kname": "sr0", "fstype": null, "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": "VMware IDE CDR10", "serial": "10000000000000000001", "state": "running", "owner": "root", "group": "cdrom", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "deadline", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": true, "pkname": null, "hctl": "2:0:0:0", "tran": "ata", "rev": "1.00", "vendor": "NECVMWar"}] diff --git a/tests/fixtures/centos-7.7/lsblk-allcols.out b/tests/fixtures/centos-7.7/lsblk-allcols.out new file mode 100644 index 00000000..3c64c133 --- /dev/null +++ b/tests/fixtures/centos-7.7/lsblk-allcols.out @@ -0,0 +1,7 @@ +NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT KNAME FSTYPE LABEL UUID PARTLABEL PARTUUID RA MODEL SERIAL STATE OWNER GROUP MODE ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC ROTA SCHED RQ-SIZE DISC-ALN DISC-GRAN DISC-MAX DISC-ZERO WSAME WWN RAND PKNAME HCTL TRAN REV VENDOR +sda 8:0 0 20G 0 disk sda 4096 VMware Virtual S running root disk brw-rw---- 0 512 0 512 512 1 deadline 128 0 0B 0B 0 32M 1 0:0:0:0 spi 1.0 VMware, +├─sda1 8:1 0 1G 0 part /boot sda1 xfs 05d927bb-5875-49e3-ada1-7f46cb31c932 4096 root disk brw-rw---- 0 512 0 512 512 1 deadline 128 0 0B 0B 0 32M 1 sda +└─sda2 8:2 0 19G 0 part sda2 LVM2_member 3klkIj-w1qk-DkJi-0XBJ-y3o7-i2Ac-vHqWBM 4096 root disk brw-rw---- 0 512 0 512 512 1 deadline 128 0 0B 0B 0 32M 1 sda + ├─centos-root 253:0 0 17G 0 lvm / dm-0 xfs 07d718ef-950c-4e5b-98e0-42a1147b77d9 4096 running root disk brw-rw---- 0 512 0 512 512 1 128 0 0B 0B 0 32M 0 sda2 + └─centos-swap 253:1 0 2G 0 lvm [SWAP] dm-1 swap 615eb89d-bcbf-46ad-80e3-c483ef5c931f 4096 running root disk brw-rw---- 0 512 0 512 512 1 128 0 0B 0B 0 32M 0 sda2 +sr0 11:0 1 1024M 0 rom sr0 128 VMware IDE CDR10 10000000000000000001 running root cdrom brw-rw---- 0 512 0 512 512 1 deadline 128 0 0B 0B 0 0B 1 2:0:0:0 ata 1.00 NECVMWar diff --git a/tests/fixtures/centos-7.7/lsblk.json b/tests/fixtures/centos-7.7/lsblk.json index 22ce443f..43c3b0ae 100644 --- a/tests/fixtures/centos-7.7/lsblk.json +++ b/tests/fixtures/centos-7.7/lsblk.json @@ -1 +1 @@ -[{"name": "sda", "maj_min": "8:0", "rm": false, "size": "20G", "ro": false, "type": "disk"}, {"name": "sda1", "maj_min": "8:1", "rm": false, "size": "1G", "ro": false, "type": "part", "mountpoint": "/boot"}, {"name": "sda2", "maj_min": "8:2", "rm": false, "size": "19G", "ro": false, "type": "part"}, {"name": "centos-root", "maj_min": "253:0", "rm": false, "size": "17G", "ro": false, "type": "lvm", "mountpoint": "/"}, {"name": "centos-swap", "maj_min": "253:1", "rm": false, "size": "2G", "ro": false, "type": "lvm", "mountpoint": "[SWAP]"}, {"name": "sr0", "maj_min": "11:0", "rm": true, "size": "1024M", "ro": false, "type": "rom"}] +[{"name": "sda", "maj_min": "8:0", "rm": false, "size": "20G", "ro": false, "type": "disk", "mountpoint": null}, {"name": "sda1", "maj_min": "8:1", "rm": false, "size": "1G", "ro": false, "type": "part", "mountpoint": "/boot"}, {"name": "sda2", "maj_min": "8:2", "rm": false, "size": "19G", "ro": false, "type": "part", "mountpoint": null}, {"name": "centos-root", "maj_min": "253:0", "rm": false, "size": "17G", "ro": false, "type": "lvm", "mountpoint": "/"}, {"name": "centos-swap", "maj_min": "253:1", "rm": false, "size": "2G", "ro": false, "type": "lvm", "mountpoint": "[SWAP]"}, {"name": "sr0", "maj_min": "11:0", "rm": true, "size": "1024M", "ro": false, "type": "rom", "mountpoint": null}] diff --git a/tests/fixtures/create_fixtures.sh b/tests/fixtures/create_fixtures.sh index 05231031..e6234353 100644 --- a/tests/fixtures/create_fixtures.sh +++ b/tests/fixtures/create_fixtures.sh @@ -35,6 +35,7 @@ ls / > ls.out ls -al / > ls-al.out ls -alh / > ls-alh.out lsblk > lsblk.out +lsblk -o +KNAME,FSTYPE,LABEL,UUID,PARTLABEL,PARTUUID,RA,MODEL,SERIAL,STATE,OWNER,GROUP,MODE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,RQ-SIZE,DISC-ALN,DISC-GRAN,DISC-MAX,DISC-ZERO,WSAME,WWN,RAND,PKNAME,HCTL,TRAN,REV,VENDOR > lsblk-allcols.out lsmod > lsmod.out lsof > lsof.out sudo lsof > lsof-sudo.out diff --git a/tests/fixtures/ubuntu-18.04/lsblk-allcols.json b/tests/fixtures/ubuntu-18.04/lsblk-allcols.json new file mode 100644 index 00000000..ff3d82ca --- /dev/null +++ b/tests/fixtures/ubuntu-18.04/lsblk-allcols.json @@ -0,0 +1 @@ +[{"name": "fd0", "maj_min": "2:0", "rm": true, "size": "1.4M", "ro": false, "type": "disk", "mountpoint": null, "kname": "fd0", "fstype": null, "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "cfq", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": true, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop0", "maj_min": "7:0", "rm": false, "size": "54.5M", "ro": true, "type": "loop", "mountpoint": "/snap/core18/1223", "kname": "loop0", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop1", "maj_min": "7:1", "rm": false, "size": "89.1M", "ro": true, "type": "loop", "mountpoint": "/snap/core/7917", "kname": "loop1", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop2", "maj_min": "7:2", "rm": false, "size": "11M", "ro": true, "type": "loop", "mountpoint": "/snap/slcli/383", "kname": "loop2", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop3", "maj_min": "7:3", "rm": false, "size": "8.6M", "ro": true, "type": "loop", "mountpoint": "/snap/doctl/215", "kname": "loop3", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop4", "maj_min": "7:4", "rm": false, "size": "89.1M", "ro": true, "type": "loop", "mountpoint": "/snap/core/8039", "kname": "loop4", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop5", "maj_min": "7:5", "rm": false, "size": "67M", "ro": true, "type": "loop", "mountpoint": "/snap/google-cloud-sdk/106", "kname": "loop5", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop6", "maj_min": "7:6", "rm": false, "size": "66.8M", "ro": true, "type": "loop", "mountpoint": "/snap/google-cloud-sdk/105", "kname": "loop6", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop7", "maj_min": "7:7", "rm": false, "size": "3.2M", "ro": true, "type": "loop", "mountpoint": "/snap/stress-ng/1046", "kname": "loop7", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop8", "maj_min": "7:8", "rm": false, "size": "8.7M", "ro": true, "type": "loop", "mountpoint": "/snap/doctl/222", "kname": "loop8", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop9", "maj_min": "7:9", "rm": false, "size": "54.5M", "ro": true, "type": "loop", "mountpoint": "/snap/core18/1265", "kname": "loop9", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "loop10", "maj_min": "7:10", "rm": false, "size": "3.2M", "ro": true, "type": "loop", "mountpoint": "/snap/stress-ng/1076", "kname": "loop10", "fstype": "squashfs", "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "none", "rq_size": 128, "disc_aln": 0, "disc_gran": "4K", "disc_max": "4G", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": false, "pkname": null, "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "sda", "maj_min": "8:0", "rm": false, "size": "20G", "ro": false, "type": "disk", "mountpoint": null, "kname": "sda", "fstype": null, "label": null, "uuid": null, "partlabel": null, "partuuid": null, "ra": 128, "model": "VMware Virtual S", "serial": null, "state": "running", "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "cfq", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": true, "pkname": null, "hctl": "32:0:0:0", "tran": "spi", "rev": "1.0", "vendor": "VMware,"}, {"name": "sda1", "maj_min": "8:1", "rm": false, "size": "1M", "ro": false, "type": "part", "mountpoint": null, "kname": "sda1", "fstype": null, "label": null, "uuid": null, "partlabel": null, "partuuid": "e0614271-c211-4324-a5bc-8e6bcb66da43", "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "cfq", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": true, "pkname": "sda", "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "sda2", "maj_min": "8:2", "rm": false, "size": "20G", "ro": false, "type": "part", "mountpoint": "/", "kname": "sda2", "fstype": "ext4", "label": null, "uuid": "011527a0-c72a-4c00-a50e-ee90da26b6e2", "partlabel": null, "partuuid": "744589e8-5711-4750-9984-c34d66f93879", "ra": 128, "model": null, "serial": null, "state": null, "owner": "root", "group": "disk", "mode": "brw-rw----", "alignment": 0, "min_io": 512, "opt_io": 0, "phy_sec": 512, "log_sec": 512, "rota": true, "sched": "cfq", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": true, "pkname": "sda", "hctl": null, "tran": null, "rev": null, "vendor": null}, {"name": "sr0", "maj_min": "11:0", "rm": true, "size": "64.8M", "ro": false, "type": "rom", "mountpoint": null, "kname": "sr0", "fstype": "iso9660", "label": "CDROM", "uuid": "2019-08-12-10-17-03-63", "partlabel": null, "partuuid": null, "ra": 128, "model": "VMware SATA CD00", "serial": "00000000000000000001", "state": "running", "owner": "root", "group": "cdrom", "mode": "brw-rw----", "alignment": 0, "min_io": 2048, "opt_io": 0, "phy_sec": 2048, "log_sec": 2048, "rota": true, "sched": "cfq", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": true, "pkname": null, "hctl": "2:0:0:0", "tran": "sata", "rev": "1.00", "vendor": "NECVMWar"}, {"name": "sr1", "maj_min": "11:1", "rm": true, "size": "848M", "ro": false, "type": "rom", "mountpoint": null, "kname": "sr1", "fstype": "iso9660", "label": "Ubuntu-Server 18.04.3 LTS amd64", "uuid": "2019-08-05-20-00-00-00", "partlabel": null, "partuuid": null, "ra": 128, "model": "VMware SATA CD01", "serial": "01000000000000000001", "state": "running", "owner": "root", "group": "cdrom", "mode": "brw-rw----", "alignment": 0, "min_io": 2048, "opt_io": 0, "phy_sec": 2048, "log_sec": 2048, "rota": true, "sched": "cfq", "rq_size": 128, "disc_aln": 0, "disc_gran": "0B", "disc_max": "0B", "disc_zero": false, "wsame": "0B", "wwn": null, "rand": true, "pkname": null, "hctl": "3:0:0:0", "tran": "sata", "rev": "1.00", "vendor": "NECVMWar"}] diff --git a/tests/fixtures/ubuntu-18.04/lsblk-allcols.out b/tests/fixtures/ubuntu-18.04/lsblk-allcols.out new file mode 100644 index 00000000..1f305553 --- /dev/null +++ b/tests/fixtures/ubuntu-18.04/lsblk-allcols.out @@ -0,0 +1,18 @@ +NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT KNAME FSTYPE LABEL UUID PARTLABEL PARTUUID RA MODEL SERIAL STATE OWNER GROUP MODE ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC ROTA SCHED RQ-SIZE DISC-ALN DISC-GRAN DISC-MAX DISC-ZERO WSAME WWN RAND PKNAME HCTL TRAN REV VENDOR +fd0 2:0 1 1.4M 0 disk fd0 128 root disk brw-rw---- 0 512 0 512 512 1 cfq 128 0 0B 0B 0 0B 1 +loop0 7:0 0 54.5M 1 loop /snap/core18/1223 loop0 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop1 7:1 0 89.1M 1 loop /snap/core/7917 loop1 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop2 7:2 0 11M 1 loop /snap/slcli/383 loop2 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop3 7:3 0 8.6M 1 loop /snap/doctl/215 loop3 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop4 7:4 0 89.1M 1 loop /snap/core/8039 loop4 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop5 7:5 0 67M 1 loop /snap/google-cloud-sdk/106 loop5 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop6 7:6 0 66.8M 1 loop /snap/google-cloud-sdk/105 loop6 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop7 7:7 0 3.2M 1 loop /snap/stress-ng/1046 loop7 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop8 7:8 0 8.7M 1 loop /snap/doctl/222 loop8 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop9 7:9 0 54.5M 1 loop /snap/core18/1265 loop9 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +loop10 7:10 0 3.2M 1 loop /snap/stress-ng/1076 loop10 squashfs 128 root disk brw-rw---- 0 512 0 512 512 1 none 128 0 4K 4G 0 0B 0 +sda 8:0 0 20G 0 disk sda 128 VMware Virtual S running root disk brw-rw---- 0 512 0 512 512 1 cfq 128 0 0B 0B 0 0B 1 32:0:0:0 spi 1.0 VMware, +├─sda1 8:1 0 1M 0 part sda1 e0614271-c211-4324-a5bc-8e6bcb66da43 128 root disk brw-rw---- 0 512 0 512 512 1 cfq 128 0 0B 0B 0 0B 1 sda +└─sda2 8:2 0 20G 0 part / sda2 ext4 011527a0-c72a-4c00-a50e-ee90da26b6e2 744589e8-5711-4750-9984-c34d66f93879 128 root disk brw-rw---- 0 512 0 512 512 1 cfq 128 0 0B 0B 0 0B 1 sda +sr0 11:0 1 64.8M 0 rom sr0 iso9660 CDROM 2019-08-12-10-17-03-63 128 VMware SATA CD00 00000000000000000001 running root cdrom brw-rw---- 0 2048 0 2048 2048 1 cfq 128 0 0B 0B 0 0B 1 2:0:0:0 sata 1.00 NECVMWar +sr1 11:1 1 848M 0 rom sr1 iso9660 Ubuntu-Server 18.04.3 LTS amd64 2019-08-05-20-00-00-00 128 VMware SATA CD01 01000000000000000001 running root cdrom brw-rw---- 0 2048 0 2048 2048 1 cfq 128 0 0B 0B 0 0B 1 3:0:0:0 sata 1.00 NECVMWar diff --git a/tests/fixtures/ubuntu-18.04/lsblk.json b/tests/fixtures/ubuntu-18.04/lsblk.json index 584d365e..5fc629a0 100644 --- a/tests/fixtures/ubuntu-18.04/lsblk.json +++ b/tests/fixtures/ubuntu-18.04/lsblk.json @@ -1 +1 @@ -[{"name": "fd0", "maj_min": "2:0", "rm": true, "size": "1.4M", "ro": false, "type": "disk"}, {"name": "loop0", "maj_min": "7:0", "rm": false, "size": "54.5M", "ro": true, "type": "loop", "mountpoint": "/snap/core18/1223"}, {"name": "loop1", "maj_min": "7:1", "rm": false, "size": "11M", "ro": true, "type": "loop", "mountpoint": "/snap/slcli/383"}, {"name": "loop2", "maj_min": "7:2", "rm": false, "size": "88.7M", "ro": true, "type": "loop", "mountpoint": "/snap/core/7396"}, {"name": "loop3", "maj_min": "7:3", "rm": false, "size": "66.5M", "ro": true, "type": "loop", "mountpoint": "/snap/google-cloud-sdk/103"}, {"name": "loop4", "maj_min": "7:4", "rm": false, "size": "66.5M", "ro": true, "type": "loop", "mountpoint": "/snap/google-cloud-sdk/104"}, {"name": "loop5", "maj_min": "7:5", "rm": false, "size": "54.4M", "ro": true, "type": "loop", "mountpoint": "/snap/core18/1074"}, {"name": "loop7", "maj_min": "7:7", "rm": false, "size": "8.6M", "ro": true, "type": "loop", "mountpoint": "/snap/doctl/187"}, {"name": "loop8", "maj_min": "7:8", "rm": false, "size": "3.1M", "ro": true, "type": "loop", "mountpoint": "/snap/stress-ng/847"}, {"name": "loop9", "maj_min": "7:9", "rm": false, "size": "8.6M", "ro": true, "type": "loop", "mountpoint": "/snap/doctl/215"}, {"name": "loop10", "maj_min": "7:10", "rm": false, "size": "89.1M", "ro": true, "type": "loop", "mountpoint": "/snap/core/7917"}, {"name": "loop11", "maj_min": "7:11", "rm": false, "size": "3.2M", "ro": true, "type": "loop", "mountpoint": "/snap/stress-ng/924"}, {"name": "sda", "maj_min": "8:0", "rm": false, "size": "20G", "ro": false, "type": "disk"}, {"name": "sda1", "maj_min": "8:1", "rm": false, "size": "1M", "ro": false, "type": "part"}, {"name": "sda2", "maj_min": "8:2", "rm": false, "size": "20G", "ro": false, "type": "part", "mountpoint": "/"}, {"name": "sr0", "maj_min": "11:0", "rm": true, "size": "64.8M", "ro": false, "type": "rom"}, {"name": "sr1", "maj_min": "11:1", "rm": true, "size": "848M", "ro": false, "type": "rom"}] +[{"name": "fd0", "maj_min": "2:0", "rm": true, "size": "1.4M", "ro": false, "type": "disk", "mountpoint": null}, {"name": "loop0", "maj_min": "7:0", "rm": false, "size": "54.5M", "ro": true, "type": "loop", "mountpoint": "/snap/core18/1223"}, {"name": "loop1", "maj_min": "7:1", "rm": false, "size": "11M", "ro": true, "type": "loop", "mountpoint": "/snap/slcli/383"}, {"name": "loop2", "maj_min": "7:2", "rm": false, "size": "88.7M", "ro": true, "type": "loop", "mountpoint": "/snap/core/7396"}, {"name": "loop3", "maj_min": "7:3", "rm": false, "size": "66.5M", "ro": true, "type": "loop", "mountpoint": "/snap/google-cloud-sdk/103"}, {"name": "loop4", "maj_min": "7:4", "rm": false, "size": "66.5M", "ro": true, "type": "loop", "mountpoint": "/snap/google-cloud-sdk/104"}, {"name": "loop5", "maj_min": "7:5", "rm": false, "size": "54.4M", "ro": true, "type": "loop", "mountpoint": "/snap/core18/1074"}, {"name": "loop7", "maj_min": "7:7", "rm": false, "size": "8.6M", "ro": true, "type": "loop", "mountpoint": "/snap/doctl/187"}, {"name": "loop8", "maj_min": "7:8", "rm": false, "size": "3.1M", "ro": true, "type": "loop", "mountpoint": "/snap/stress-ng/847"}, {"name": "loop9", "maj_min": "7:9", "rm": false, "size": "8.6M", "ro": true, "type": "loop", "mountpoint": "/snap/doctl/215"}, {"name": "loop10", "maj_min": "7:10", "rm": false, "size": "89.1M", "ro": true, "type": "loop", "mountpoint": "/snap/core/7917"}, {"name": "loop11", "maj_min": "7:11", "rm": false, "size": "3.2M", "ro": true, "type": "loop", "mountpoint": "/snap/stress-ng/924"}, {"name": "sda", "maj_min": "8:0", "rm": false, "size": "20G", "ro": false, "type": "disk", "mountpoint": null}, {"name": "sda1", "maj_min": "8:1", "rm": false, "size": "1M", "ro": false, "type": "part", "mountpoint": null}, {"name": "sda2", "maj_min": "8:2", "rm": false, "size": "20G", "ro": false, "type": "part", "mountpoint": "/"}, {"name": "sr0", "maj_min": "11:0", "rm": true, "size": "64.8M", "ro": false, "type": "rom", "mountpoint": null}, {"name": "sr1", "maj_min": "11:1", "rm": true, "size": "848M", "ro": false, "type": "rom", "mountpoint": null}] diff --git a/tests/test_lsblk.py b/tests/test_lsblk.py index 5a1e4af3..1fa5fc88 100644 --- a/tests/test_lsblk.py +++ b/tests/test_lsblk.py @@ -16,6 +16,12 @@ class MyTests(unittest.TestCase): with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/lsblk.out'), 'r') as f: self.ubuntu_18_4_lsblk = f.read() + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/lsblk-allcols.out'), 'r') as f: + self.centos_7_7_lsblk_allcols = f.read() + + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/lsblk-allcols.out'), 'r') as f: + self.ubuntu_18_4_lsblk_allcols = f.read() + # output with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/lsblk.json'), 'r') as f: self.centos_7_7_lsblk_json = json.loads(f.read()) @@ -23,6 +29,12 @@ class MyTests(unittest.TestCase): with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/lsblk.json'), 'r') as f: self.ubuntu_18_4_lsblk_json = json.loads(f.read()) + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/lsblk-allcols.json'), 'r') as f: + self.centos_7_7_lsblk_allcols_json = json.loads(f.read()) + + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/lsblk-allcols.json'), 'r') as f: + self.ubuntu_18_4_lsblk_allcols_json = json.loads(f.read()) + def test_lsblk_centos_7_7(self): """ Test 'lsblk' on Centos 7.7 @@ -35,6 +47,18 @@ class MyTests(unittest.TestCase): """ self.assertEqual(jc.parsers.lsblk.parse(self.ubuntu_18_4_lsblk, quiet=True), self.ubuntu_18_4_lsblk_json) + def test_lsblk_allcols_centos_7_7(self): + """ + Test 'lsblk -o +KNAME,FSTYPE,LABEL,UUID,PARTLABEL,PARTUUID,RA,MODEL,SERIAL,STATE,OWNER,GROUP,MODE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,RQ-SIZE,DISC-ALN,DISC-GRAN,DISC-MAX,DISC-ZERO,WSAME,WWN,RAND,PKNAME,HCTL,TRAN,REV,VENDOR' on Centos 7.7 + """ + self.assertEqual(jc.parsers.lsblk.parse(self.centos_7_7_lsblk_allcols, quiet=True), self.centos_7_7_lsblk_allcols_json) + + def test_lsblk_allcols_ubuntu_18_4(self): + """ + Test 'lsblk -o +KNAME,FSTYPE,LABEL,UUID,PARTLABEL,PARTUUID,RA,MODEL,SERIAL,STATE,OWNER,GROUP,MODE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,RQ-SIZE,DISC-ALN,DISC-GRAN,DISC-MAX,DISC-ZERO,WSAME,WWN,RAND,PKNAME,HCTL,TRAN,REV,VENDOR' on Ubuntu 18.4 + """ + self.assertEqual(jc.parsers.lsblk.parse(self.ubuntu_18_4_lsblk_allcols, quiet=True), self.ubuntu_18_4_lsblk_allcols_json) + if __name__ == '__main__': unittest.main()