Support using third party iso8601 module if system doesn't provide one.

Change-Id: I5d035738d244d66d33788636c8ee8b322c227a0e
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/subunit/__init__.py b/python/samba/subunit/__init__.py
index ab55ace104dce5c54a40323298651cad5356633e..cdc593398a005ec9a9d81f2b248e360c1ef61dde 100644 (file)
--- a/python/samba/subunit/__init__.py
+++ b/python/samba/subunit/__init__.py
@@ -17,6 +17,11 @@
 
 """Subunit test protocol."""
 
+import samba
+
+samba.ensure_third_party_module("iso8601", "pyiso8601")
+import iso8601
+
 import unittest
 
 

diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index a1d49fd51c41cb3dbe55e143692cd03572eb13d2..5308e99a243266b2fac8f224a21bd15adaf8c331 100644 (file)
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -21,7 +21,7 @@ import re
 import sys
 from samba import subunit
 from samba.subunit.run import TestProtocolClient
-import iso8601
+from samba.subunit import iso8601
 import unittest
 
 VALID_RESULTS = ['success', 'successful', 'failure', 'fail', 'skip', 'knownfail', 'error', 'xfail', 'skip-testsuite', 'testsuite-failure', 'testsuite-xfail', 'testsuite-success', 'testsuite-error', 'uxsuccess', 'testsuite-uxsuccess']