Merge pull request #454 from splunk/py3-testcases-refractor

Py3 testcases refractor

Author: ashah-splunk

tests/__init__.py

@@ -15,11 +15,7 @@
 # under the License.
 
 # Utility file for unit tests, import common functions and modules
-from __future__ import absolute_import
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import sys, os
 import io
 

tests/modularinput/__init__.py

@@ -14,13 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from __future__ import absolute_import
 
 import sys
 
 import pytest
 
-from tests.modularinput.modularinput_testlib import unittest, xml_compare, data_open
+from tests.modularinput.modularinput_testlib import xml_compare, data_open
 from splunklib.modularinput.event import Event, ET
 from splunklib.modularinput.event_writer import EventWriter
 
@@ -99,7 +98,7 @@ def test_writing_events_on_event_writer(capsys):
     first_out_part = captured.out
 
     with data_open("data/stream_with_one_event.xml") as data:
-        found = ET.fromstring("%s</stream>" % first_out_part)
+        found = ET.fromstring(f"{first_out_part}</stream>")
         expected = ET.parse(data).getroot()
 
         assert xml_compare(expected, found)

tests/modularinput/modularinput_testlib.py

@@ -14,10 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from __future__ import absolute_import
 from tests.modularinput.modularinput_testlib import unittest, data_open
 from splunklib.modularinput.input_definition import InputDefinition
 
+
 class InputDefinitionTestCase(unittest.TestCase):
 
     def test_parse_inputdef_with_zero_inputs(self):
@@ -72,5 +72,6 @@ def test_attempt_to_parse_malformed_input_definition_will_throw_exception(self):
         with self.assertRaises(ValueError):
             found = InputDefinition.parse(data_open("data/conf_with_invalid_inputs.xml"))
 
+
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()

tests/modularinput/test_event.py

@@ -13,15 +13,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from __future__ import absolute_import
+import xml.etree.ElementTree as ET
 from tests.modularinput.modularinput_testlib import unittest, xml_compare, data_open
 from splunklib.modularinput.scheme import Scheme
 from splunklib.modularinput.argument import Argument
 
-try:
-    import xml.etree.cElementTree as ET
-except ImportError:
-    import xml.etree.ElementTree as ET
 
 class SchemeTest(unittest.TestCase):
     def test_generate_xml_from_scheme_with_default_values(self):
@@ -40,7 +36,7 @@ def test_generate_xml_from_scheme(self):
         some arguments added matches what we expect."""
 
         scheme = Scheme("abcd")
-        scheme.description = u"쎼 and 쎶 and <&> für"
+        scheme.description = "쎼 and 쎶 and <&> für"
         scheme.streaming_mode = Scheme.streaming_mode_simple
         scheme.use_external_validation = "false"
         scheme.use_single_instance = "true"
@@ -50,7 +46,7 @@ def test_generate_xml_from_scheme(self):
 
         arg2 = Argument(
             name="arg2",
-            description=u"쎼 and 쎶 and <&> für",
+            description="쎼 and 쎶 and <&> für",
             validation="is_pos_int('some_name')",
             data_type=Argument.data_type_number,
             required_on_edit=True,
@@ -69,7 +65,7 @@ def test_generate_xml_from_scheme_with_arg_title(self):
         some arguments added matches what we expect. Also sets the title on an argument."""
 
         scheme = Scheme("abcd")
-        scheme.description = u"쎼 and 쎶 and <&> für"
+        scheme.description = "쎼 and 쎶 and <&> für"
         scheme.streaming_mode = Scheme.streaming_mode_simple
         scheme.use_external_validation = "false"
         scheme.use_single_instance = "true"
@@ -79,7 +75,7 @@ def test_generate_xml_from_scheme_with_arg_title(self):
 
         arg2 = Argument(
             name="arg2",
-            description=u"쎼 and 쎶 and <&> für",
+            description="쎼 and 쎶 and <&> für",
             validation="is_pos_int('some_name')",
             data_type=Argument.data_type_number,
             required_on_edit=True,
@@ -113,7 +109,7 @@ def test_generate_xml_from_argument(self):
 
         argument = Argument(
             name="some_name",
-            description=u"쎼 and 쎶 and <&> für",
+            description="쎼 and 쎶 and <&> für",
             validation="is_pos_int('some_name')",
             data_type=Argument.data_type_boolean,
             required_on_edit="true",

tests/modularinput/test_input_definition.py

@@ -1,16 +1,13 @@
 import sys
 
+import io
+import xml.etree.ElementTree as ET
 from splunklib.client import Service
 from splunklib.modularinput import Script, EventWriter, Scheme, Argument, Event
-import io
 
 from splunklib.modularinput.utils import xml_compare
 from tests.modularinput.modularinput_testlib import data_open
 
-try:
-    import xml.etree.cElementTree as ET
-except ImportError:
-    import xml.etree.ElementTree as ET
 
 TEST_SCRIPT_PATH = "__IGNORED_SCRIPT_PATH__"
 
@@ -51,7 +48,7 @@ def test_scheme_properly_generated_by_script(capsys):
     class NewScript(Script):
         def get_scheme(self):
             scheme = Scheme("abcd")
-            scheme.description = u"\uC3BC and \uC3B6 and <&> f\u00FCr"
+            scheme.description = "\uC3BC and \uC3B6 and <&> f\u00FCr"
             scheme.streaming_mode = scheme.streaming_mode_simple
             scheme.use_external_validation = False
             scheme.use_single_instance = True
@@ -60,7 +57,7 @@ def get_scheme(self):
             scheme.add_argument(arg1)
 
             arg2 = Argument("arg2")
-            arg2.description = u"\uC3BC and \uC3B6 and <&> f\u00FCr"
+            arg2.description = "\uC3BC and \uC3B6 and <&> f\u00FCr"
             arg2.data_type = Argument.data_type_number
             arg2.required_on_create = True
             arg2.required_on_edit = True
@@ -208,7 +205,7 @@ def test_service_property(capsys):
     # Override abstract methods
     class NewScript(Script):
         def __init__(self):
-            super(NewScript, self).__init__()
+            super().__init__()
             self.authority_uri = None
 
         def get_scheme(self):

tests/modularinput/test_scheme.py

@@ -14,10 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from __future__ import absolute_import
+
 from tests.modularinput.modularinput_testlib import unittest, data_open
 from splunklib.modularinput.validation_definition import ValidationDefinition
 
+
 class ValidationDefinitionTestCase(unittest.TestCase):
     def test_validation_definition_parse(self):
         """Check that parsing produces expected result"""
@@ -42,5 +43,6 @@ def test_validation_definition_parse(self):
 
         self.assertEqual(expected, found)
 
+
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()

tests/modularinput/test_script.py

@@ -15,10 +15,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from sys import version_info as python_version
-
 from os import path
 import logging
 

tests/modularinput/test_validation_definition.py

@@ -7,7 +7,7 @@
 from splunklib import six
 
 
-class Chunk(object):
+class Chunk:
     def __init__(self, version, meta, data):
         self.version = six.ensure_str(version)
         self.meta = json.loads(meta)
@@ -16,21 +16,21 @@ def __init__(self, version, meta, data):
                                    dialect=dialect)
 
 
-class ChunkedDataStreamIter(collections.Iterator):
+class ChunkedDataStreamIter(collections.abc.Iterator):
     def __init__(self, chunk_stream):
         self.chunk_stream = chunk_stream
 
     def __next__(self):
-        return self.next()
+        return next(self)
 
-    def next(self):
+    def __next__(self):
         try:
             return self.chunk_stream.read_chunk()
         except EOFError:
             raise StopIteration
 
 
-class ChunkedDataStream(collections.Iterable):
+class ChunkedDataStream(collections.abc.Iterable):
     def __iter__(self):
         return ChunkedDataStreamIter(self)
 
@@ -91,7 +91,7 @@ def _build_data_csv(data):
 
     headers = set()
     for datum in data:
-        headers.update(datum.keys())
+        headers.update(list(datum.keys()))
     writer = csv.DictWriter(csvout, headers,
                             dialect=splunklib.searchcommands.internals.CsvDialect)
     writer.writeheader()