add TypeError to except block. add /usr/bin/time tests

jc/parsers/time.py

@@ -179,7 +179,7 @@ def process(proc_data):
         if key in proc_data:
             try:
                 proc_data[key] = int(proc_data[key])
-            except (ValueError):
+            except (ValueError, TypeError):
                 proc_data[key] = None
 
     float_list = ['real_time', 'user_time', 'system_time']

tests/fixtures/osx-10.14.6/time-l.json

@@ -0,0 +1 @@
+{"real_time":0.0,"user_time":0.0,"system_time":0.0,"maximum_resident_set_size":688128,"average_shared_memory_size":0,"average_unshared_data_size":0,"average_unshared_stack_size":0,"page_reclaims":178,"page_faults":0,"swaps":0,"block_input_operations":0,"block_output_operations":0,"messages_sent":0,"messages_received":0,"signals_received":0,"voluntary_context_switches":0,"involuntary_context_switches":3}

tests/fixtures/osx-10.14.6/time-l.out

@@ -0,0 +1,15 @@
+        0.00 real         0.00 user         0.00 sys
+    688128  maximum resident set size
+         0  average shared memory size
+         0  average unshared data size
+         0  average unshared stack size
+       178  page reclaims
+         0  page faults
+         0  swaps
+         0  block input operations
+         0  block output operations
+         0  messages sent
+         0  messages received
+         0  signals received
+         0  voluntary context switches
+         3  involuntary context switches

tests/fixtures/osx-10.14.6/time-lp.json

@@ -0,0 +1 @@
+{"real_time":0.0,"user_time":0.0,"system_time":0.0,"maximum_resident_set_size":688128,"average_shared_memory_size":0,"average_unshared_data_size":0,"average_unshared_stack_size":0,"page_reclaims":178,"page_faults":0,"swaps":0,"block_input_operations":0,"block_output_operations":0,"messages_sent":0,"messages_received":0,"signals_received":0,"voluntary_context_switches":0,"involuntary_context_switches":3}

tests/fixtures/osx-10.14.6/time-lp.out

@@ -0,0 +1,17 @@
+real         0.00
+user         0.00
+sys          0.00
+    688128  maximum resident set size
+         0  average shared memory size
+         0  average unshared data size
+         0  average unshared stack size
+       178  page reclaims
+         0  page faults
+         0  swaps
+         0  block input operations
+         0  block output operations
+         0  messages sent
+         0  messages received
+         0  signals received
+         0  voluntary context switches
+         3  involuntary context switches

tests/fixtures/osx-10.14.6/time-p.json

@@ -0,0 +1 @@
+{"real_time":0.0,"user_time":0.0,"system_time":0.0}

tests/fixtures/osx-10.14.6/time-p.out

@@ -0,0 +1,3 @@
+real         0.00
+user         0.00
+sys          0.00

tests/fixtures/osx-10.14.6/time.json

@@ -0,0 +1 @@
+{"real_time":0.0,"user_time":0.0,"system_time":0.0}

tests/fixtures/osx-10.14.6/time.out

@@ -0,0 +1 @@
+        0.00 real         0.00 user         0.00 sys

tests/fixtures/ubuntu-18.04/time-p.json

@@ -0,0 +1 @@
+{"real_time":0.0,"user_time":0.0,"system_time":0.0}

tests/fixtures/ubuntu-18.04/time-p.out

@@ -0,0 +1,3 @@
+real 0.00
+user 0.00
+sys 0.00

tests/fixtures/ubuntu-18.04/time-verbose.json

@@ -0,0 +1 @@
+{"command_being_timed":"echo","user_time":0.0,"system_time":0.0,"cpu_percent":0,"elapsed_time":"0:00.00","average_shared_text_size":0,"average_unshared_data_size":0,"average_stack_size":0,"average_total_size":0,"maximum_resident_set_size":2016,"average_resident_set_size":0,"major_pagefaults":0,"minor_pagefaults":71,"voluntary_context_switches":1,"involuntary_context_switches":1,"swaps":0,"block_input_operations":0,"block_output_operations":0,"messages_sent":0,"messages_received":0,"signals_delivered":0,"page_size":4096,"exit_status":0,"elapsed_time_hours":0,"elapsed_time_minutes":0,"elapsed_time_seconds":0,"elapsed_time_centiseconds":0,"elapsed_time_total_seconds":0.0}

tests/fixtures/ubuntu-18.04/time-verbose.out

@@ -0,0 +1,23 @@
+    Command being timed: "echo"
+    User time (seconds): 0.00
+    System time (seconds): 0.00
+    Percent of CPU this job got: 0%
+    Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.00
+    Average shared text size (kbytes): 0
+    Average unshared data size (kbytes): 0
+    Average stack size (kbytes): 0
+    Average total size (kbytes): 0
+    Maximum resident set size (kbytes): 2016
+    Average resident set size (kbytes): 0
+    Major (requiring I/O) page faults: 0
+    Minor (reclaiming a frame) page faults: 71
+    Voluntary context switches: 1
+    Involuntary context switches: 1
+    Swaps: 0
+    File system inputs: 0
+    File system outputs: 0
+    Socket messages sent: 0
+    Socket messages received: 0
+    Signals delivered: 0
+    Page size (bytes): 4096
+    Exit status: 0

tests/fixtures/ubuntu-18.04/time.json

@@ -0,0 +1 @@
+{"user_time":0.0,"system_time":0.0,"elapsed_time":"0:00.00","cpu_percent":100,"average_shared_text":"0","average_unshared_data_size":0,"maximum_resident_set_size":2064,"block_input_operations":0,"block_output_operations":0,"major_pagefaults":0,"minor_pagefaults":71,"swaps":0,"elapsed_time_hours":0,"elapsed_time_minutes":0,"elapsed_time_seconds":0,"elapsed_time_centiseconds":0,"elapsed_time_total_seconds":0.0}

tests/fixtures/ubuntu-18.04/time.out

@@ -0,0 +1,3 @@
+0.00user 0.00system 0:00.00elapsed 100%CPU (0avgtext+0avgdata 2064maxresident)k
+0inputs+0outputs (0major+71minor)pagefaults 0swaps
+

tests/fixtures/ubuntu-18.04/time2.json

@@ -0,0 +1 @@
+{"user_time":0.0,"system_time":0.0,"elapsed_time":"0:00.00","cpu_percent":null,"average_shared_text":"0","average_unshared_data_size":0,"maximum_resident_set_size":2068,"block_input_operations":0,"block_output_operations":0,"major_pagefaults":0,"minor_pagefaults":70,"swaps":0,"elapsed_time_hours":0,"elapsed_time_minutes":0,"elapsed_time_seconds":0,"elapsed_time_centiseconds":0,"elapsed_time_total_seconds":0.0}

tests/fixtures/ubuntu-18.04/time2.out

@@ -0,0 +1,2 @@
+0.00user 0.00system 0:00.00elapsed ?%CPU (0avgtext+0avgdata 2068maxresident)k
+0inputs+0outputs (0major+70minor)pagefaults 0swaps

tests/test_time.py

@@ -0,0 +1,118 @@
+import os
+import json
+import unittest
+import jc.parsers.time
+
+THIS_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+class MyTests(unittest.TestCase):
+
+    def setUp(self):
+        # input
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/time.out'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_time = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/time2.out'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_time2 = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/time-p.out'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_time_p = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/time-verbose.out'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_time_verbose = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/time.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_time = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/time-l.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_time_l = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/time-p.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_time_p = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/time-lp.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_time_lp = f.read()
+
+        # output
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/time.json'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_time_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/time2.json'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_time2_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/time-p.json'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_time_p_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/time-verbose.json'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_time_verbose_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/time.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_time_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/time-l.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_time_l_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/time-p.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_time_p_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/time-lp.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_time_lp_json = json.loads(f.read())
+
+    def test_time_nodata(self):
+        """
+        Test plain 'time' with no data
+        """
+        self.assertEqual(jc.parsers.time.parse('', quiet=True), {})
+
+    def test_time_ubuntu_18_4(self):
+        """
+        Test plain 'time' on Ubuntu 18.4
+        """
+        self.assertEqual(jc.parsers.time.parse(self.ubuntu_18_4_time, quiet=True), self.ubuntu_18_4_time_json)
+
+    def test_time2_ubuntu_18_4(self):
+        """
+        Test plain 'time' on Ubuntu 18.4 with ? in CPU%
+        """
+        self.assertEqual(jc.parsers.time.parse(self.ubuntu_18_4_time2, quiet=True), self.ubuntu_18_4_time2_json)
+
+    def test_time_p_ubuntu_18_4(self):
+        """
+        Test 'time -p' on Ubuntu 18.4
+        """
+        self.assertEqual(jc.parsers.time.parse(self.ubuntu_18_4_time_p, quiet=True), self.ubuntu_18_4_time_p_json)
+
+    def test_time_verbose_ubuntu_18_4(self):
+        """
+        Test 'time --verbose' on Ubuntu 18.4
+        """
+        self.assertEqual(jc.parsers.time.parse(self.ubuntu_18_4_time_verbose, quiet=True), self.ubuntu_18_4_time_verbose_json)
+
+    def test_time_osx_10_14_6(self):
+        """
+        Test plain 'time' on OSX 10.14.6
+        """
+        self.assertEqual(jc.parsers.time.parse(self.osx_10_14_6_time, quiet=True), self.osx_10_14_6_time_json)
+
+    def test_time_l_osx_10_14_6(self):
+        """
+        Test 'time -l' on OSX 10.14.6
+        """
+        self.assertEqual(jc.parsers.time.parse(self.osx_10_14_6_time_l, quiet=True), self.osx_10_14_6_time_l_json)
+
+    def test_time_p_osx_10_14_6(self):
+        """
+        Test 'time -p' on OSX 10.14.6
+        """
+        self.assertEqual(jc.parsers.time.parse(self.osx_10_14_6_time_p, quiet=True), self.osx_10_14_6_time_p_json)
+
+    def test_time_lp_osx_10_14_6(self):
+        """
+        Test 'time -lp' on OSX 10.14.6
+        """
+        self.assertEqual(jc.parsers.time.parse(self.osx_10_14_6_time_lp, quiet=True), self.osx_10_14_6_time_lp_json)
+
+
+if __name__ == '__main__':
+    unittest.main()