diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 560e8bc0..d6ebc449 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: matrix: os: - ubuntu-latest - python: [ 2.7, 3.7 ] + python: [ 3.10.7, 3.11.2 ] splunk-version: - "8.1" - "8.2" diff --git a/tests/modularinput/modularinput_testlib.py b/tests/modularinput/modularinput_testlib.py index 81930173..c86dcb8f 100644 --- a/tests/modularinput/modularinput_testlib.py +++ b/tests/modularinput/modularinput_testlib.py @@ -16,10 +16,7 @@ # 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 diff --git a/tests/searchcommands/chunked_data_stream.py b/tests/searchcommands/chunked_data_stream.py index ae5363ef..be63f759 100644 --- a/tests/searchcommands/chunked_data_stream.py +++ b/tests/searchcommands/chunked_data_stream.py @@ -16,7 +16,7 @@ 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 @@ -30,7 +30,7 @@ def next(self): raise StopIteration -class ChunkedDataStream(collections.Iterable): +class ChunkedDataStream(collections.abc.Iterable): def __iter__(self): return ChunkedDataStreamIter(self) diff --git a/tests/searchcommands/test_builtin_options.py b/tests/searchcommands/test_builtin_options.py index e5c2dd8d..24bd1b4c 100644 --- a/tests/searchcommands/test_builtin_options.py +++ b/tests/searchcommands/test_builtin_options.py @@ -18,10 +18,7 @@ from __future__ import absolute_import, division, print_function, unicode_literals from splunklib.six.moves import cStringIO as StringIO -try: - from unittest2 import main, TestCase -except ImportError: - from unittest import main, TestCase +from unittest import main, TestCase import os import sys diff --git a/tests/searchcommands/test_decorators.py b/tests/searchcommands/test_decorators.py index dd65aa0a..d5ce40a2 100755 --- a/tests/searchcommands/test_decorators.py +++ b/tests/searchcommands/test_decorators.py @@ -17,10 +17,7 @@ from __future__ import absolute_import, division, print_function, unicode_literals -try: - from unittest2 import main, TestCase -except ImportError: - from unittest import main, TestCase +from unittest import main, TestCase import sys from io import TextIOWrapper diff --git a/tests/searchcommands/test_internals_v2.py b/tests/searchcommands/test_internals_v2.py index ec9b3f66..1f294d9e 100755 --- a/tests/searchcommands/test_internals_v2.py +++ b/tests/searchcommands/test_internals_v2.py @@ -35,10 +35,7 @@ from time import time from types import MethodType from sys import version_info as python_version -try: - from unittest2 import main, TestCase -except ImportError: - from unittest import main, TestCase +from unittest import main, TestCase import splunklib.six.moves.cPickle as pickle import gzip diff --git a/tests/test_all.py b/tests/test_all.py index 7789f8fd..aee2aa86 100755 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -18,10 +18,7 @@ from __future__ import absolute_import import os -try: - import unittest2 as unittest # We must be sure to get unittest2--not unittest--on Python 2.6 -except ImportError: - import unittest +import unittest os.chdir(os.path.dirname(os.path.abspath(__file__))) suite = unittest.defaultTestLoader.discover('.') diff --git a/tests/test_app.py b/tests/test_app.py index 3dbc4cff..2b953155 100755 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -104,8 +104,5 @@ def test_updateInfo(self): self.assertTrue(p is not None) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_binding.py b/tests/test_binding.py index 2af294cf..39514a59 100755 --- a/tests/test_binding.py +++ b/tests/test_binding.py @@ -979,8 +979,5 @@ def check_response(handler): if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_collection.py b/tests/test_collection.py index 0fd9a1c3..badfeeef 100755 --- a/tests/test_collection.py +++ b/tests/test_collection.py @@ -261,9 +261,6 @@ def test_collection_inputs_getitem(self): if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_conf.py b/tests/test_conf.py index 05f8a193..6f6c6914 100755 --- a/tests/test_conf.py +++ b/tests/test_conf.py @@ -105,8 +105,5 @@ def test_confs(self): self.assertTrue(conf_name in confs) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_data.py b/tests/test_data.py index 2a4e176b..0f46ce43 100755 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -252,9 +252,6 @@ def test_record(self): if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_event_type.py b/tests/test_event_type.py index 5ae2c7ec..cc3fc09c 100755 --- a/tests/test_event_type.py +++ b/tests/test_event_type.py @@ -89,8 +89,5 @@ def test_enable_disable(self): self.assertEqual(self.event_type['disabled'], '0') if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_fired_alert.py b/tests/test_fired_alert.py index 2480d415..0c776ec5 100755 --- a/tests/test_fired_alert.py +++ b/tests/test_fired_alert.py @@ -91,8 +91,5 @@ def test_read(self): alert.content if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_index.py b/tests/test_index.py index 9e2a5329..6001cb19 100755 --- a/tests/test_index.py +++ b/tests/test_index.py @@ -21,10 +21,7 @@ import os import time import splunklib.client as client -try: - import unittest -except ImportError: - import unittest2 as unittest +import unittest import pytest @@ -184,8 +181,5 @@ def test_upload(self): self.assertEventuallyTrue(lambda: self.totalEventCount() == event_count+4, timeout=60) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_input.py b/tests/test_input.py index c7d48dc3..0fedcabc 100755 --- a/tests/test_input.py +++ b/tests/test_input.py @@ -21,10 +21,7 @@ from tests import testlib import logging from splunklib import six -try: - import unittest -except ImportError: - import unittest2 as unittest +import unittest import splunklib.client as client @@ -299,8 +296,5 @@ def test_delete(self): if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_job.py b/tests/test_job.py index 18f3189a..ff6aea79 100755 --- a/tests/test_job.py +++ b/tests/test_job.py @@ -24,10 +24,7 @@ from tests import testlib -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import splunklib.client as client import splunklib.results as results diff --git a/tests/test_kvstore_batch.py b/tests/test_kvstore_batch.py index d32b665e..2067491b 100755 --- a/tests/test_kvstore_batch.py +++ b/tests/test_kvstore_batch.py @@ -17,12 +17,10 @@ from __future__ import absolute_import from tests import testlib from splunklib.six.moves import range -try: - import unittest -except ImportError: - import unittest2 as unittest +import unittest import splunklib.client as client + class KVStoreBatchTestCase(testlib.SDKTestCase): def setUp(self): super(KVStoreBatchTestCase, self).setUp() @@ -76,8 +74,5 @@ def tearDown(self): confs['test'].delete() if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_kvstore_conf.py b/tests/test_kvstore_conf.py index 98020342..c5e8f0aa 100755 --- a/tests/test_kvstore_conf.py +++ b/tests/test_kvstore_conf.py @@ -18,10 +18,7 @@ import json from tests import testlib -try: - import unittest -except ImportError: - import unittest2 as unittest +import unittest import splunklib.client as client class KVStoreConfTestCase(testlib.SDKTestCase): @@ -98,8 +95,5 @@ def tearDown(self): self.confs['test'].delete() if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_kvstore_data.py b/tests/test_kvstore_data.py index 6ddeae68..61fa0bb9 100755 --- a/tests/test_kvstore_data.py +++ b/tests/test_kvstore_data.py @@ -18,10 +18,7 @@ import json from tests import testlib from splunklib.six.moves import range -try: - import unittest -except ImportError: - import unittest2 as unittest +import unittest import splunklib.client as client class KVStoreDataTestCase(testlib.SDKTestCase): @@ -97,8 +94,5 @@ def tearDown(self): self.confs['test'].delete() if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_logger.py b/tests/test_logger.py index 7e9f5c8e..03f65bc9 100755 --- a/tests/test_logger.py +++ b/tests/test_logger.py @@ -45,8 +45,5 @@ def test_crud(self): self.assertEqual(self.service.loggers['AuditLogger']['level'], saved) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_message.py b/tests/test_message.py index cd76c783..8e610fb4 100755 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -49,8 +49,5 @@ def test_invalid_name(self): self.assertRaises(client.InvalidNameException, self.service.messages.create, [1,2,3], value="Who, me?") if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_modular_input.py b/tests/test_modular_input.py index ae6e797d..ff3c840e 100755 --- a/tests/test_modular_input.py +++ b/tests/test_modular_input.py @@ -16,10 +16,7 @@ from __future__ import absolute_import from __future__ import print_function -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from tests import testlib import pytest diff --git a/tests/test_modular_input_kinds.py b/tests/test_modular_input_kinds.py index c6b7391e..9f6e1aaf 100755 --- a/tests/test_modular_input_kinds.py +++ b/tests/test_modular_input_kinds.py @@ -17,10 +17,7 @@ from __future__ import absolute_import from __future__ import print_function from tests import testlib -try: - import unittest -except ImportError: - import unittest2 as unittest +import unittest import splunklib.client as client import pytest @@ -78,8 +75,5 @@ def test_list_modular_inputs(self): self.check_modular_input_kind(m) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_results.py b/tests/test_results.py index 5fdca2b9..ad560ba9 100755 --- a/tests/test_results.py +++ b/tests/test_results.py @@ -165,8 +165,5 @@ def assert_parsed_results_equals(self, xml_text, expected_results): self.assertEqual(expected_results, actual_results) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_role.py b/tests/test_role.py index 16205d05..ec6080af 100755 --- a/tests/test_role.py +++ b/tests/test_role.py @@ -106,8 +106,5 @@ def test_update(self): self.assertEqual(int(self.role['srchJobsQuota']), kwargs['srchJobsQuota']) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_saved_search.py b/tests/test_saved_search.py index d1f8f57c..238ef3b7 100755 --- a/tests/test_saved_search.py +++ b/tests/test_saved_search.py @@ -248,8 +248,5 @@ def test_acl_fails_without_owner(self): ) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_service.py b/tests/test_service.py index 34afef2c..0de2bb82 100755 --- a/tests/test_service.py +++ b/tests/test_service.py @@ -364,8 +364,5 @@ def test_proper_namespace_with_service_namespace(self): if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_storage_passwords.py b/tests/test_storage_passwords.py index 4f2fee81..fb0b0353 100644 --- a/tests/test_storage_passwords.py +++ b/tests/test_storage_passwords.py @@ -234,8 +234,5 @@ def test_spaces_in_username(self): self.assertEqual(start_count, len(self.storage_passwords)) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_user.py b/tests/test_user.py index b8a97f81..3519fbb8 100755 --- a/tests/test_user.py +++ b/tests/test_user.py @@ -85,8 +85,5 @@ def test_delete_is_case_insensitive(self): self.assertFalse(self.username.upper() in users) if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/test_utils.py b/tests/test_utils.py index 5eedbaba..0f9baa91 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -108,8 +108,5 @@ def checkFilePermissions(dir_path): if __name__ == "__main__": - try: - import unittest2 as unittest - except ImportError: - import unittest + import unittest unittest.main() diff --git a/tests/testlib.py b/tests/testlib.py index 4a99e026..e67baed5 100644 --- a/tests/testlib.py +++ b/tests/testlib.py @@ -29,10 +29,7 @@ from time import sleep from datetime import datetime, timedelta -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest try: from utils import parse