From ce134dc332dd9175e0d1823a4959bed427a3ddce Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Thu, 12 Dec 2019 09:09:57 -0800 Subject: [PATCH] Add OSX tests for ls --- tests/fixtures/osx-10.14.6/ls-al.json | 1 + tests/fixtures/osx-10.14.6/ls-al.out | 29 +++++++++++++++++++++ tests/fixtures/osx-10.14.6/ls-alh.json | 1 + tests/fixtures/osx-10.14.6/ls-alh.out | 29 +++++++++++++++++++++ tests/fixtures/osx-10.14.6/ls.json | 1 + tests/fixtures/osx-10.14.6/ls.out | 18 +++++++++++++ tests/test_ls.py | 36 ++++++++++++++++++++++++++ 7 files changed, 115 insertions(+) create mode 100644 tests/fixtures/osx-10.14.6/ls-al.json create mode 100755 tests/fixtures/osx-10.14.6/ls-al.out create mode 100644 tests/fixtures/osx-10.14.6/ls-alh.json create mode 100755 tests/fixtures/osx-10.14.6/ls-alh.out create mode 100644 tests/fixtures/osx-10.14.6/ls.json create mode 100755 tests/fixtures/osx-10.14.6/ls.out diff --git a/tests/fixtures/osx-10.14.6/ls-al.json b/tests/fixtures/osx-10.14.6/ls-al.json new file mode 100644 index 00000000..3f607cb7 --- /dev/null +++ b/tests/fixtures/osx-10.14.6/ls-al.json @@ -0,0 +1 @@ +[{"filename": ".", "flags": "drwxr-xr-x", "links": 28, "owner": "root", "group": "wheel", "size": 896, "date": "Nov 18 18:16"}, {"filename": "..", "flags": "drwxr-xr-x", "links": 28, "owner": "root", "group": "wheel", "size": 896, "date": "Nov 18 18:16"}, {"filename": ".DS_Store", "flags": "-rw-rw-r--", "links": 1, "owner": "root", "group": "admin", "size": 6148, "date": "Dec 2 13:27"}, {"filename": ".DocumentRevisions-V100", "flags": "d--x--x--x", "links": 9, "owner": "root", "group": "wheel", "size": 288, "date": "Nov 22 14:30"}, {"filename": ".OSInstallerMessages", "flags": "-rw-r--r--", "links": 1, "owner": "root", "group": "wheel", "size": 591, "date": "Nov 18 18:16"}, {"filename": ".PKInstallSandboxManager-SystemSoftware", "flags": "drwxr-xr-x@", "links": 2, "owner": "root", "group": "wheel", "size": 64, "date": "Dec 11 09:06"}, {"filename": ".Spotlight-V100", "flags": "drwx------", "links": 5, "owner": "root", "group": "wheel", "size": 160, "date": "Nov 18 17:45"}, {"filename": ".file", "flags": "----------", "links": 1, "owner": "root", "group": "admin", "size": 0, "date": "Feb 25 2019"}, {"filename": ".fseventsd", "flags": "drwx------", "links": 172, "owner": "root", "group": "wheel", "size": 5504, "date": "Dec 11 17:13"}, {"filename": ".vol", "flags": "drwxr-xr-x", "links": 2, "owner": "root", "group": "wheel", "size": 64, "date": "Feb 25 2019"}, {"filename": "Applications", "flags": "drwxrwxr-x+", "links": 43, "owner": "root", "group": "admin", "size": 1376, "date": "Dec 2 13:27"}, {"filename": "Library", "flags": "drwxr-xr-x+", "links": 62, "owner": "root", "group": "wheel", "size": 1984, "date": "Nov 22 14:33"}, {"filename": "Network", "flags": "drwxr-xr-x", "links": 2, "owner": "root", "group": "wheel", "size": 64, "date": "Feb 25 2019"}, {"filename": "System", "flags": "drwxr-xr-x@", "links": 5, "owner": "root", "group": "wheel", "size": 160, "date": "Sep 20 18:36"}, {"filename": "Users", "flags": "drwxr-xr-x", "links": 5, "owner": "root", "group": "admin", "size": 160, "date": "Nov 18 17:48"}, {"filename": "Volumes", "flags": "drwxr-xr-x+", "links": 4, "owner": "root", "group": "wheel", "size": 128, "date": "Dec 11 09:06"}, {"filename": "bin", "flags": "drwxr-xr-x@", "links": 37, "owner": "root", "group": "wheel", "size": 1184, "date": "Nov 18 18:15"}, {"filename": "cores", "flags": "drwxrwxr-t", "links": 2, "owner": "root", "group": "admin", "size": 64, "date": "Feb 25 2019"}, {"filename": "dev", "flags": "dr-xr-xr-x", "links": 3, "owner": "root", "group": "wheel", "size": 4392, "date": "Nov 22 14:30"}, {"filename": "etc", "link_to": "private/etc", "flags": "lrwxr-xr-x@", "links": 1, "owner": "root", "group": "wheel", "size": 11, "date": "Nov 18 17:40"}, {"filename": "home", "flags": "dr-xr-xr-x", "links": 2, "owner": "root", "group": "wheel", "size": 1, "date": "Nov 22 15:21"}, {"filename": "installer.failurerequests", "flags": "-rw-r--r--", "links": 1, "owner": "root", "group": "wheel", "size": 313, "date": "May 30 2019"}, {"filename": "net", "flags": "dr-xr-xr-x", "links": 2, "owner": "root", "group": "wheel", "size": 1, "date": "Nov 22 15:21"}, {"filename": "private", "flags": "drwxr-xr-x", "links": 6, "owner": "root", "group": "wheel", "size": 192, "date": "Sep 20 18:37"}, {"filename": "sbin", "flags": "drwxr-xr-x@", "links": 64, "owner": "root", "group": "wheel", "size": 2048, "date": "Nov 18 18:15"}, {"filename": "tmp", "link_to": "private/tmp", "flags": "lrwxr-xr-x@", "links": 1, "owner": "root", "group": "wheel", "size": 11, "date": "Nov 18 17:40"}, {"filename": "usr", "flags": "drwxr-xr-x@", "links": 9, "owner": "root", "group": "wheel", "size": 288, "date": "Sep 20 18:32"}, {"filename": "var", "link_to": "private/var", "flags": "lrwxr-xr-x@", "links": 1, "owner": "root", "group": "wheel", "size": 11, "date": "Nov 18 17:40"}] diff --git a/tests/fixtures/osx-10.14.6/ls-al.out b/tests/fixtures/osx-10.14.6/ls-al.out new file mode 100755 index 00000000..40b3f964 --- /dev/null +++ b/tests/fixtures/osx-10.14.6/ls-al.out @@ -0,0 +1,29 @@ +total 37 +drwxr-xr-x 28 root wheel 896 Nov 18 18:16 . +drwxr-xr-x 28 root wheel 896 Nov 18 18:16 .. +-rw-rw-r-- 1 root admin 6148 Dec 2 13:27 .DS_Store +d--x--x--x 9 root wheel 288 Nov 22 14:30 .DocumentRevisions-V100 +-rw-r--r-- 1 root wheel 591 Nov 18 18:16 .OSInstallerMessages +drwxr-xr-x@ 2 root wheel 64 Dec 11 09:06 .PKInstallSandboxManager-SystemSoftware +drwx------ 5 root wheel 160 Nov 18 17:45 .Spotlight-V100 +---------- 1 root admin 0 Feb 25 2019 .file +drwx------ 172 root wheel 5504 Dec 11 17:13 .fseventsd +drwxr-xr-x 2 root wheel 64 Feb 25 2019 .vol +drwxrwxr-x+ 43 root admin 1376 Dec 2 13:27 Applications +drwxr-xr-x+ 62 root wheel 1984 Nov 22 14:33 Library +drwxr-xr-x 2 root wheel 64 Feb 25 2019 Network +drwxr-xr-x@ 5 root wheel 160 Sep 20 18:36 System +drwxr-xr-x 5 root admin 160 Nov 18 17:48 Users +drwxr-xr-x+ 4 root wheel 128 Dec 11 09:06 Volumes +drwxr-xr-x@ 37 root wheel 1184 Nov 18 18:15 bin +drwxrwxr-t 2 root admin 64 Feb 25 2019 cores +dr-xr-xr-x 3 root wheel 4392 Nov 22 14:30 dev +lrwxr-xr-x@ 1 root wheel 11 Nov 18 17:40 etc -> private/etc +dr-xr-xr-x 2 root wheel 1 Nov 22 15:21 home +-rw-r--r-- 1 root wheel 313 May 30 2019 installer.failurerequests +dr-xr-xr-x 2 root wheel 1 Nov 22 15:21 net +drwxr-xr-x 6 root wheel 192 Sep 20 18:37 private +drwxr-xr-x@ 64 root wheel 2048 Nov 18 18:15 sbin +lrwxr-xr-x@ 1 root wheel 11 Nov 18 17:40 tmp -> private/tmp +drwxr-xr-x@ 9 root wheel 288 Sep 20 18:32 usr +lrwxr-xr-x@ 1 root wheel 11 Nov 18 17:40 var -> private/var diff --git a/tests/fixtures/osx-10.14.6/ls-alh.json b/tests/fixtures/osx-10.14.6/ls-alh.json new file mode 100644 index 00000000..c73e6685 --- /dev/null +++ b/tests/fixtures/osx-10.14.6/ls-alh.json @@ -0,0 +1 @@ +[{"filename": ".", "flags": "drwxr-xr-x", "links": 28, "owner": "root", "group": "wheel", "size": null, "date": "Nov 18 18:16"}, {"filename": "..", "flags": "drwxr-xr-x", "links": 28, "owner": "root", "group": "wheel", "size": null, "date": "Nov 18 18:16"}, {"filename": ".DS_Store", "flags": "-rw-rw-r--", "links": 1, "owner": "root", "group": "admin", "size": null, "date": "Dec 2 13:27"}, {"filename": ".DocumentRevisions-V100", "flags": "d--x--x--x", "links": 9, "owner": "root", "group": "wheel", "size": null, "date": "Nov 22 14:30"}, {"filename": ".OSInstallerMessages", "flags": "-rw-r--r--", "links": 1, "owner": "root", "group": "wheel", "size": null, "date": "Nov 18 18:16"}, {"filename": ".PKInstallSandboxManager-SystemSoftware", "flags": "drwxr-xr-x@", "links": 2, "owner": "root", "group": "wheel", "size": null, "date": "Dec 11 09:06"}, {"filename": ".Spotlight-V100", "flags": "drwx------", "links": 5, "owner": "root", "group": "wheel", "size": null, "date": "Nov 18 17:45"}, {"filename": ".file", "flags": "----------", "links": 1, "owner": "root", "group": "admin", "size": null, "date": "Feb 25 2019"}, {"filename": ".fseventsd", "flags": "drwx------", "links": 172, "owner": "root", "group": "wheel", "size": null, "date": "Dec 11 17:13"}, {"filename": ".vol", "flags": "drwxr-xr-x", "links": 2, "owner": "root", "group": "wheel", "size": null, "date": "Feb 25 2019"}, {"filename": "Applications", "flags": "drwxrwxr-x+", "links": 43, "owner": "root", "group": "admin", "size": null, "date": "Dec 2 13:27"}, {"filename": "Library", "flags": "drwxr-xr-x+", "links": 62, "owner": "root", "group": "wheel", "size": null, "date": "Nov 22 14:33"}, {"filename": "Network", "flags": "drwxr-xr-x", "links": 2, "owner": "root", "group": "wheel", "size": null, "date": "Feb 25 2019"}, {"filename": "System", "flags": "drwxr-xr-x@", "links": 5, "owner": "root", "group": "wheel", "size": null, "date": "Sep 20 18:36"}, {"filename": "Users", "flags": "drwxr-xr-x", "links": 5, "owner": "root", "group": "admin", "size": null, "date": "Nov 18 17:48"}, {"filename": "Volumes", "flags": "drwxr-xr-x+", "links": 4, "owner": "root", "group": "wheel", "size": null, "date": "Dec 11 09:06"}, {"filename": "bin", "flags": "drwxr-xr-x@", "links": 37, "owner": "root", "group": "wheel", "size": null, "date": "Nov 18 18:15"}, {"filename": "cores", "flags": "drwxrwxr-t", "links": 2, "owner": "root", "group": "admin", "size": null, "date": "Feb 25 2019"}, {"filename": "dev", "flags": "dr-xr-xr-x", "links": 3, "owner": "root", "group": "wheel", "size": null, "date": "Nov 22 14:30"}, {"filename": "etc", "link_to": "private/etc", "flags": "lrwxr-xr-x@", "links": 1, "owner": "root", "group": "wheel", "size": null, "date": "Nov 18 17:40"}, {"filename": "home", "flags": "dr-xr-xr-x", "links": 2, "owner": "root", "group": "wheel", "size": null, "date": "Nov 22 15:21"}, {"filename": "installer.failurerequests", "flags": "-rw-r--r--", "links": 1, "owner": "root", "group": "wheel", "size": null, "date": "May 30 2019"}, {"filename": "net", "flags": "dr-xr-xr-x", "links": 2, "owner": "root", "group": "wheel", "size": null, "date": "Nov 22 15:21"}, {"filename": "private", "flags": "drwxr-xr-x", "links": 6, "owner": "root", "group": "wheel", "size": null, "date": "Sep 20 18:37"}, {"filename": "sbin", "flags": "drwxr-xr-x@", "links": 64, "owner": "root", "group": "wheel", "size": null, "date": "Nov 18 18:15"}, {"filename": "tmp", "link_to": "private/tmp", "flags": "lrwxr-xr-x@", "links": 1, "owner": "root", "group": "wheel", "size": null, "date": "Nov 18 17:40"}, {"filename": "usr", "flags": "drwxr-xr-x@", "links": 9, "owner": "root", "group": "wheel", "size": null, "date": "Sep 20 18:32"}, {"filename": "var", "link_to": "private/var", "flags": "lrwxr-xr-x@", "links": 1, "owner": "root", "group": "wheel", "size": null, "date": "Nov 18 17:40"}] diff --git a/tests/fixtures/osx-10.14.6/ls-alh.out b/tests/fixtures/osx-10.14.6/ls-alh.out new file mode 100755 index 00000000..7859f9c8 --- /dev/null +++ b/tests/fixtures/osx-10.14.6/ls-alh.out @@ -0,0 +1,29 @@ +total 37 +drwxr-xr-x 28 root wheel 896B Nov 18 18:16 . +drwxr-xr-x 28 root wheel 896B Nov 18 18:16 .. +-rw-rw-r-- 1 root admin 6.0K Dec 2 13:27 .DS_Store +d--x--x--x 9 root wheel 288B Nov 22 14:30 .DocumentRevisions-V100 +-rw-r--r-- 1 root wheel 591B Nov 18 18:16 .OSInstallerMessages +drwxr-xr-x@ 2 root wheel 64B Dec 11 09:06 .PKInstallSandboxManager-SystemSoftware +drwx------ 5 root wheel 160B Nov 18 17:45 .Spotlight-V100 +---------- 1 root admin 0B Feb 25 2019 .file +drwx------ 172 root wheel 5.4K Dec 11 17:13 .fseventsd +drwxr-xr-x 2 root wheel 64B Feb 25 2019 .vol +drwxrwxr-x+ 43 root admin 1.3K Dec 2 13:27 Applications +drwxr-xr-x+ 62 root wheel 1.9K Nov 22 14:33 Library +drwxr-xr-x 2 root wheel 64B Feb 25 2019 Network +drwxr-xr-x@ 5 root wheel 160B Sep 20 18:36 System +drwxr-xr-x 5 root admin 160B Nov 18 17:48 Users +drwxr-xr-x+ 4 root wheel 128B Dec 11 09:06 Volumes +drwxr-xr-x@ 37 root wheel 1.2K Nov 18 18:15 bin +drwxrwxr-t 2 root admin 64B Feb 25 2019 cores +dr-xr-xr-x 3 root wheel 4.3K Nov 22 14:30 dev +lrwxr-xr-x@ 1 root wheel 11B Nov 18 17:40 etc -> private/etc +dr-xr-xr-x 2 root wheel 1B Nov 22 15:21 home +-rw-r--r-- 1 root wheel 313B May 30 2019 installer.failurerequests +dr-xr-xr-x 2 root wheel 1B Nov 22 15:21 net +drwxr-xr-x 6 root wheel 192B Sep 20 18:37 private +drwxr-xr-x@ 64 root wheel 2.0K Nov 18 18:15 sbin +lrwxr-xr-x@ 1 root wheel 11B Nov 18 17:40 tmp -> private/tmp +drwxr-xr-x@ 9 root wheel 288B Sep 20 18:32 usr +lrwxr-xr-x@ 1 root wheel 11B Nov 18 17:40 var -> private/var diff --git a/tests/fixtures/osx-10.14.6/ls.json b/tests/fixtures/osx-10.14.6/ls.json new file mode 100644 index 00000000..1da8ce15 --- /dev/null +++ b/tests/fixtures/osx-10.14.6/ls.json @@ -0,0 +1 @@ +[{"filename": "Applications"}, {"filename": "Library"}, {"filename": "Network"}, {"filename": "System"}, {"filename": "Users"}, {"filename": "Volumes"}, {"filename": "bin"}, {"filename": "cores"}, {"filename": "dev"}, {"filename": "etc"}, {"filename": "home"}, {"filename": "installer.failurerequests"}, {"filename": "net"}, {"filename": "private"}, {"filename": "sbin"}, {"filename": "tmp"}, {"filename": "usr"}, {"filename": "var"}] diff --git a/tests/fixtures/osx-10.14.6/ls.out b/tests/fixtures/osx-10.14.6/ls.out new file mode 100755 index 00000000..1140fbc2 --- /dev/null +++ b/tests/fixtures/osx-10.14.6/ls.out @@ -0,0 +1,18 @@ +Applications +Library +Network +System +Users +Volumes +bin +cores +dev +etc +home +installer.failurerequests +net +private +sbin +tmp +usr +var diff --git a/tests/test_ls.py b/tests/test_ls.py index 89d05624..0dbe1255 100644 --- a/tests/test_ls.py +++ b/tests/test_ls.py @@ -16,18 +16,27 @@ class MyTests(unittest.TestCase): with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/ls.out'), 'r') as f: self.ubuntu_18_4_ls = f.read() + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/ls.out'), 'r') as f: + self.osx_10_14_6_ls = f.read() + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/ls-al.out'), 'r') as f: self.centos_7_7_ls_al = f.read() with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/ls-al.out'), 'r') as f: self.ubuntu_18_4_ls_al = f.read() + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/ls-al.out'), 'r') as f: + self.osx_10_14_6_ls_al = f.read() + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/ls-alh.out'), 'r') as f: self.centos_7_7_ls_alh = f.read() with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/ls-alh.out'), 'r') as f: self.ubuntu_18_4_ls_alh = f.read() + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/ls-alh.out'), 'r') as f: + self.osx_10_14_6_ls_alh = f.read() + # output with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/ls.json'), 'r') as f: self.centos_7_7_ls_json = json.loads(f.read()) @@ -35,18 +44,27 @@ class MyTests(unittest.TestCase): with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/ls.json'), 'r') as f: self.ubuntu_18_4_ls_json = json.loads(f.read()) + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/ls.json'), 'r') as f: + self.osx_10_14_6_ls_json = json.loads(f.read()) + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/ls-al.json'), 'r') as f: self.centos_7_7_ls_al_json = json.loads(f.read()) with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/ls-al.json'), 'r') as f: self.ubuntu_18_4_ls_al_json = json.loads(f.read()) + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/ls-al.json'), 'r') as f: + self.osx_10_14_6_ls_al_json = json.loads(f.read()) + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/ls-alh.json'), 'r') as f: self.centos_7_7_ls_alh_json = json.loads(f.read()) with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/ls-alh.json'), 'r') as f: self.ubuntu_18_4_ls_alh_json = json.loads(f.read()) + with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/ls-alh.json'), 'r') as f: + self.osx_10_14_6_ls_alh_json = json.loads(f.read()) + def test_ls_centos_7_7(self): """ Test plain 'ls /' on Centos 7.7 @@ -59,6 +77,12 @@ class MyTests(unittest.TestCase): """ self.assertEqual(jc.parsers.ls.parse(self.ubuntu_18_4_ls, quiet=True), self.ubuntu_18_4_ls_json) + def test_ls_osx_10_14_6(self): + """ + Test plain 'ls /' on OSX 10.14.6 + """ + self.assertEqual(jc.parsers.ls.parse(self.osx_10_14_6_ls, quiet=True), self.osx_10_14_6_ls_json) + def test_ls_al_centos_7_7(self): """ Test 'ls -al /' on Centos 7.7 @@ -71,6 +95,12 @@ class MyTests(unittest.TestCase): """ self.assertEqual(jc.parsers.ls.parse(self.ubuntu_18_4_ls_al, quiet=True), self.ubuntu_18_4_ls_al_json) + def test_ls_al_osx_10_14_6(self): + """ + Test 'ls -al /' on OSX 10.14.6 + """ + self.assertEqual(jc.parsers.ls.parse(self.osx_10_14_6_ls_al, quiet=True), self.osx_10_14_6_ls_al_json) + def test_ls_alh_centos_7_7(self): """ Test 'ls -alh /' on Centos 7.7 @@ -83,6 +113,12 @@ class MyTests(unittest.TestCase): """ self.assertEqual(jc.parsers.ls.parse(self.ubuntu_18_4_ls_alh, quiet=True), self.ubuntu_18_4_ls_alh_json) + def test_ls_alh_osx_10_14_6(self): + """ + Test 'ls -alh /' on OSX 10.14.6 + """ + self.assertEqual(jc.parsers.ls.parse(self.osx_10_14_6_ls_alh, quiet=True), self.osx_10_14_6_ls_alh_json) + if __name__ == '__main__': unittest.main()