Minor changes to modinput tests, plus a critical fix to the data_open function

Shakeel Mohamed · Shakeel Mohamed · commit 6308a251e48c · 2013-08-16T13:46:15.000-07:00
diff --git a/splunklib/modularinput/event_writer.py b/splunklib/modularinput/event_writer.py
@@ -76,7 +76,7 @@ def write_xml_document(self, document):
 
         :param document: An ``ElementTree`` object.
         """
-        self._out.write(ET.tostring(document, "utf-8", "xml"))
+        self._out.write(ET.tostring(document))
         self._out.flush()
 
     def close(self):
diff --git a/tests/modularinput/modularinput_testlib.py b/tests/modularinput/modularinput_testlib.py
@@ -26,4 +26,4 @@
 from splunklib.modularinput.utils import xml_compare, parse_xml_data, parse_parameters
 
 def data_open(filepath):
-    return os.path.join(os.path.dirname(os.path.abspath(__file__)), filepath)
+    return open(os.path.join(os.path.dirname(os.path.abspath(__file__)), filepath))
diff --git a/tests/modularinput/test_script.py b/tests/modularinput/test_script.py
@@ -29,7 +29,7 @@
 except ImportError:
     import xml.etree.ElementTree as ET
 
-TEST_SCRIPT_PATH = "__IGNORED_SCRIPT_PATH__" #TODO: replace empty first args...
+TEST_SCRIPT_PATH = "__IGNORED_SCRIPT_PATH__"
 
 class ScriptTest(unittest.TestCase):
 
