From a51e702f77a36c93c33649d522c8265f5eab39bd Mon Sep 17 00:00:00 2001 From: Dave Marquardt Date: Thu, 5 Jan 2023 10:53:02 -0600 Subject: [PATCH] Added AIX mount test --- tests/fixtures/aix-7.1/mount.json | 1 + tests/fixtures/aix-7.1/mount.out | 17 +++++++++++++++++ tests/test_mount.py | 12 ++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 tests/fixtures/aix-7.1/mount.json create mode 100644 tests/fixtures/aix-7.1/mount.out diff --git a/tests/fixtures/aix-7.1/mount.json b/tests/fixtures/aix-7.1/mount.json new file mode 100644 index 00000000..3e5d6aa3 --- /dev/null +++ b/tests/fixtures/aix-7.1/mount.json @@ -0,0 +1 @@ +[{"filesystem":"/dev/hd4","mount_point":"/","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/dev/hd2","mount_point":"/usr","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/dev/hd9var","mount_point":"/var","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/dev/hd3","mount_point":"/tmp","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/dev/hd1","mount_point":"/home","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/dev/hd11admin","mount_point":"/admin","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/proc","mount_point":"/proc","type":"procfs","options":["rw"]},{"filesystem":"/dev/hd10opt","mount_point":"/opt","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/dev/livedump","mount_point":"/var/adm/ras/livedump","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/dev/lvvarlog","mount_point":"/var/log","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/dev/lvafslogs","mount_point":"/usr/afs/logs","type":"jfs2","options":["rw","log=/dev/hd8"]},{"filesystem":"/dev/fslv00","mount_point":"/sandbox","type":"jfs2","options":["rw","log=/dev/sboxlv_log"]},{"filesystem":"/dev/ramdisk0","mount_point":"/usr/vice/cache","type":"jfs","options":["rw","nointegrity"]},{"filesystem":"AFS","mount_point":"/afs","type":"afs","options":["rw"]},{"filesystem":"/local","mount_point":"/remote","type":"nfs3","options":["hard","intr","vers=3","sec=sys","proto=tcp","grpid","rsize=65536","wsize=65536","biods=16","nosuid"]}] diff --git a/tests/fixtures/aix-7.1/mount.out b/tests/fixtures/aix-7.1/mount.out new file mode 100644 index 00000000..c29a3381 --- /dev/null +++ b/tests/fixtures/aix-7.1/mount.out @@ -0,0 +1,17 @@ + node mounted mounted over vfs date options +-------- --------------- --------------- ------ ------------ --------------- + /dev/hd4 / jfs2 Sep 06 11:46 rw,log=/dev/hd8 + /dev/hd2 /usr jfs2 Sep 06 11:46 rw,log=/dev/hd8 + /dev/hd9var /var jfs2 Sep 06 11:46 rw,log=/dev/hd8 + /dev/hd3 /tmp jfs2 Sep 06 11:46 rw,log=/dev/hd8 + /dev/hd1 /home jfs2 Sep 06 11:47 rw,log=/dev/hd8 + /dev/hd11admin /admin jfs2 Sep 06 11:47 rw,log=/dev/hd8 + /proc /proc procfs Sep 06 11:47 rw + /dev/hd10opt /opt jfs2 Sep 06 11:47 rw,log=/dev/hd8 + /dev/livedump /var/adm/ras/livedump jfs2 Sep 06 11:47 rw,log=/dev/hd8 + /dev/lvvarlog /var/log jfs2 Sep 06 11:47 rw,log=/dev/hd8 + /dev/lvafslogs /usr/afs/logs jfs2 Sep 06 11:47 rw,log=/dev/hd8 + /dev/fslv00 /sandbox jfs2 Sep 06 11:47 rw,log=/dev/sboxlv_log + /dev/ramdisk0 /usr/vice/cache jfs Sep 06 11:47 rw,nointegrity + AFS /afs afs Sep 06 11:47 rw +remote /local /remote nfs3 Sep 06 11:49 hard,intr,vers=3,sec=sys,proto=tcp,grpid,rsize=65536,wsize=65536,biods=16,nosuid diff --git a/tests/test_mount.py b/tests/test_mount.py index 430da3c2..73effd1d 100644 --- a/tests/test_mount.py +++ b/tests/test_mount.py @@ -21,6 +21,9 @@ class MyTests(unittest.TestCase): with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/mount2.out'), 'r', encoding='utf-8') as f: osx_10_14_6_mount2 = f.read() + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/aix-7.1/mount.out'), 'r', encoding='utf-8') as f: + aix_7_1_mount = f.read() + # output with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/mount.json'), 'r', encoding='utf-8') as f: centos_7_7_mount_json = json.loads(f.read()) @@ -34,6 +37,9 @@ class MyTests(unittest.TestCase): with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/mount2.json'), 'r', encoding='utf-8') as f: osx_10_14_6_mount2_json = json.loads(f.read()) + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/aix-7.1/mount.json'), 'r', encoding='utf-8') as f: + aix_7_1_mount_json = json.loads(f.read()) + def test_mount_nodata(self): """ @@ -65,6 +71,12 @@ class MyTests(unittest.TestCase): """ self.assertEqual(jc.parsers.mount.parse(self.osx_10_14_6_mount2, quiet=True), self.osx_10_14_6_mount2_json) + def test_mount_aix_7_1(self): + """ + Test 'mount' on OSX 10.14.6 + """ + self.assertEqual(jc.parsers.mount.parse(self.aix_7_1_mount, quiet=True), self.aix_7_1_mount_json) + if __name__ == '__main__': unittest.main()