Remove Python 2 skip and workarounds in unit tests

Author: Mab879

tests/unit/ssg-module/test_build_yaml.py

@@ -2,7 +2,6 @@
 import collections
 import os
 import tempfile
-import sys
 
 import yaml
 import pytest
@@ -454,7 +453,6 @@ def rule_accounts_tmout():
     return ssg.build_yaml.Rule.from_yaml(rule_file)
 
 
-@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3 or higher")
 def test_rule_to_xml_element(rule_accounts_tmout):
     xmldiff_main = pytest.importorskip("xmldiff.main")
     rule_el = rule_accounts_tmout.to_xml_element()
@@ -487,7 +485,6 @@ def value_system_crypto_policy():
     return ssg.build_yaml.Value.from_yaml(value_file)
 
 
-@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3 or higher")
 def test_value_to_xml_element(value_system_crypto_policy):
     xmldiff_main = pytest.importorskip("xmldiff.main")
     value_el = value_system_crypto_policy.to_xml_element()

tests/unit/ssg-module/test_controls.py

@@ -1,6 +1,5 @@
 import pytest
 import os
-import sys
 
 import ssg.controls
 import ssg.build_yaml
@@ -104,7 +103,6 @@ def test_controls_load(controls_manager):
     _load_test(controls_manager, "abcd")
 
 
-@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3 or higher")
 def test_controls_invalid_rules(env_yaml):
     existing_rules = {"accounts_tmout", "configure_crypto_policy"}
     controls_manager = ssg.controls.ControlsManager(
@@ -115,7 +113,6 @@ def test_controls_invalid_rules(env_yaml):
         "Control abcd:R1 contains nonexisting rule(s) sshd_set_idle_timeout"
 
 
-@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3 or higher")
 def test_controls_levels(controls_manager):
     # Default level is the lowest level
     c_1 = controls_manager.get_control("abcd-levels", "S1")

tests/unit/ssg_test_suite/test_assert_reference_unique.py

@@ -1,15 +1,5 @@
 import os
-import pytest
 import subprocess
-import sys
-
-if sys.version_info < (3, 0):
-    try:
-        # pytest v4.6 has allow_module_level
-        pytest.skip("requires python3", allow_module_level=True)
-    except TypeError:
-        # older pytest v2.7 does not have it and it is implied
-        pytest.skip("requires python3")
 
 DATADIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "data"))
 CMD = os.path.abspath(

tests/unit/utils/test_generate_most_used_rules.py

@@ -1,6 +1,4 @@
 import os
-import sys
-import pytest
 from argparse import Namespace
 from utils.profile_tool import command_most_used_rules
 
@@ -16,7 +14,6 @@ def get_fake_args():
     )
 
 
-@pytest.mark.skipif(sys.version_info[0] < 3, reason="requires python3")
 def test_command(capsys):
     command_most_used_rules(get_fake_args())
     captured = capsys.readouterr()