more coverage on nto, osc types and osc bundle+builders

Author: attwad

pythonosc/parsing/ntp.py

@@ -15,6 +15,10 @@
 _NTP_DELTA = (_SYSTEM_EPOCH - _NTP_EPOCH).days * 24 * 3600
 
 
+class NtpError(Exception):
+  """Base class for ntp module errors."""
+
+
 def ntp_to_system_time(date):
     """Convert a NTP time to system time.
 
@@ -28,6 +32,9 @@ def system_time_to_ntp(date):
 
     System time is reprensented by seconds since the epoch in UTC.
     """
-    ntp = date + _NTP_DELTA
+    try:
+      ntp = date + _NTP_DELTA
+    except TypeError as ve:
+      raise NtpError('Invalud date: {}'.format(ve))
     num_secs, fraction = str(ntp).split('.')
     return struct.pack('>I', int(num_secs)) + struct.pack('>I', int(fraction))

pythonosc/parsing/osc_types.py

@@ -237,4 +237,7 @@ def write_date(system_time):
   if system_time == IMMEDIATELY:
     return ntp.IMMEDIATELY
 
-  return ntp.system_time_to_ntp(system_time)
+  try:
+    return ntp.system_time_to_ntp(system_time)
+  except ntp.NtpError as ntpe:
+    raise BuildError(ntpe)

pythonosc/test/test_osc_bundle.py

@@ -67,6 +67,12 @@
     b"\x00\x00\x00\x20"
     b"/SYNC\x00\x00\x00\x00")
 
+_DGRAM_UNKNOWN_TYPE = (
+    b"#bundle\x00"
+    b"\x00\x00\x00\x00\x00\x00\x00\x01"
+    b"\x00\x00\x00\x10"
+    b"iamnotaslash")
+
 
 class TestOscBundle(unittest.TestCase):
 
@@ -117,5 +123,8 @@ def test_raises_on_invalid_datagram(self):
     self.assertRaises(
         osc_bundle.ParseError, osc_bundle.OscBundle, _DGRAM_INVALID_INDEX)
 
+  def test_unknown_type(self):
+    bundle = osc_bundle.OscBundle(_DGRAM_UNKNOWN_TYPE)
+
 if __name__ == "__main__":
   unittest.main()

pythonosc/test/test_osc_bundle_builder.py

@@ -16,6 +16,10 @@ def test_raises_on_build(self):
     bundle.add_content(None)
     self.assertRaises(osc_bundle_builder.BuildError, bundle.build)
 
+  def test_raises_on_invalid_timestamp(self):
+    bundle = osc_bundle_builder.OscBundleBuilder("I am not a timestamp")
+    self.assertRaises(osc_bundle_builder.BuildError, bundle.build)
+
   def test_build_complex_bundle(self):
     bundle = osc_bundle_builder.OscBundleBuilder(
         osc_bundle_builder.IMMEDIATELY)