drop some pointless if six.PY3 else blocks in tests

Author: cognifloyd

Diff for: contrib/runners/orquesta_runner/tests/unit/test_data_flow.py

@@ -18,7 +18,6 @@
 from __future__ import absolute_import
 
 import mock
-import six
 
 from orquesta import statuses as wf_statuses
 
@@ -215,7 +214,7 @@ def assert_data_flow(self, data):
         self.assertEqual(ac_ex_db.status, ac_const.LIVEACTION_STATUS_SUCCEEDED)
 
         # Check workflow output.
-        expected_value = wf_input["a1"] if six.PY3 else wf_input["a1"].decode("utf-8")
+        expected_value = wf_input["a1"]
 
         expected_output = {
             "a6": expected_value,

Diff for: contrib/runners/orquesta_runner/tests/unit/test_error_handling.py

@@ -16,7 +16,6 @@
 from __future__ import absolute_import
 
 import mock
-import six
 
 from orquesta import statuses as wf_statuses
 
@@ -333,10 +332,7 @@ def test_fail_start_task_input_expr_eval(self):
         self.assertDictEqual(ac_ex_db.result, expected_result)
 
     def test_fail_start_task_input_value_type(self):
-        if six.PY3:
-            msg = "Value \"{'x': 'foobar'}\" must either be a string or None. Got \"dict\"."
-        else:
-            msg = "Value \"{u'x': u'foobar'}\" must either be a string or None. Got \"dict\"."
+        msg = "Value \"{'x': 'foobar'}\" must either be a string or None. Got \"dict\"."
 
         msg = "ValueError: " + msg
 
@@ -488,10 +484,7 @@ def test_fail_next_task_input_expr_eval(self):
         self.assertDictEqual(ac_ex_db.result, expected_result)
 
     def test_fail_next_task_input_value_type(self):
-        if six.PY3:
-            msg = "Value \"{'x': 'foobar'}\" must either be a string or None. Got \"dict\"."
-        else:
-            msg = "Value \"{u'x': u'foobar'}\" must either be a string or None. Got \"dict\"."
+        msg = "Value \"{'x': 'foobar'}\" must either be a string or None. Got \"dict\"."
 
         msg = "ValueError: " + msg
 

Diff for: st2api/tests/unit/controllers/v1/test_actions.py

@@ -24,7 +24,6 @@
 except ImportError:
     import json
 
-import six
 import mock
 import unittest2
 from six.moves import http_client
@@ -539,14 +538,9 @@ def test_post_parameter_type_is_array_and_invalid(self):
         post_resp = self.__do_post(ACTION_13, expect_errors=True)
         self.assertEqual(post_resp.status_int, 400)
 
-        if six.PY3:
-            expected_error = (
-                b"['string', 'object'] is not valid under any of the given schemas"
-            )
-        else:
-            expected_error = (
-                b"[u'string', u'object'] is not valid under any of the given schemas"
-            )
+        expected_error = (
+            b"['string', 'object'] is not valid under any of the given schemas"
+        )
 
         self.assertIn(expected_error, post_resp.body)
 

Diff for: st2api/tests/unit/controllers/v1/test_rules.py

@@ -336,14 +336,9 @@ def test_post_trigger_parameter_schema_validation_fails(self):
         post_resp = self.__do_post(RulesControllerTestCase.RULE_2)
         self.assertEqual(post_resp.status_int, http_client.BAD_REQUEST)
 
-        if six.PY3:
-            expected_msg = (
-                b"Additional properties are not allowed ('minutex' was unexpected)"
-            )
-        else:
-            expected_msg = (
-                b"Additional properties are not allowed (u'minutex' was unexpected)"
-            )
+        expected_msg = (
+            b"Additional properties are not allowed ('minutex' was unexpected)"
+        )
 
         self.assertIn(expected_msg, post_resp.body)
 
@@ -385,16 +380,8 @@ def test_post_invalid_custom_trigger_parameter_trigger_param_validation_enabled(
         post_resp = self.__do_post(RulesControllerTestCase.RULE_9)
         self.assertEqual(post_resp.status_int, http_client.BAD_REQUEST)
 
-        if six.PY3:
-            expected_msg_1 = (
-                "Failed validating 'type' in schema['properties']['param1']:"
-            )
-            expected_msg_2 = "12345 is not of type 'string'"
-        else:
-            expected_msg_1 = (
-                "Failed validating u'type' in schema[u'properties'][u'param1']:"
-            )
-            expected_msg_2 = "12345 is not of type u'string'"
+        expected_msg_1 = "Failed validating 'type' in schema['properties']['param1']:"
+        expected_msg_2 = "12345 is not of type 'string'"
 
         self.assertIn(expected_msg_1, post_resp.json["faultstring"])
         self.assertIn(expected_msg_2, post_resp.json["faultstring"])

Diff for: st2common/tests/unit/test_configs_registrar.py

@@ -15,7 +15,6 @@
 
 from __future__ import absolute_import
 
-import six
 import mock
 
 from st2common.content import utils as content_utils
@@ -122,16 +121,10 @@ def test_register_all_configs_with_config_schema_validation_validation_failure_1
         registrar._register_pack(pack_name="dummy_pack_5", pack_dir=PACK_6_PATH)
         packs_base_paths = content_utils.get_packs_base_paths()
 
-        if six.PY3:
-            expected_msg = (
-                'Failed validating attribute "regions" in config for pack '
-                "\"dummy_pack_6\" (.*?): 1000 is not of type 'array'"
-            )
-        else:
-            expected_msg = (
-                'Failed validating attribute "regions" in config for pack '
-                "\"dummy_pack_6\" (.*?): 1000 is not of type u'array'"
-            )
+        expected_msg = (
+            'Failed validating attribute "regions" in config for pack '
+            "\"dummy_pack_6\" (.*?): 1000 is not of type 'array'"
+        )
 
         self.assertRaisesRegexp(
             ValueError,
@@ -161,18 +154,11 @@ def test_register_all_configs_with_config_schema_validation_validation_failure_2
         registrar._register_pack(pack_name=DUMMY_PACK_19, pack_dir=PACK_19_PATH)
         packs_base_paths = content_utils.get_packs_base_paths()
 
-        if six.PY3:
-            expected_msg = (
-                'Failed validating attribute "instances.0.alias" in config for pack '
-                "\"dummy_pack_19\" (.*?): {'not': 'string'} is not of type "
-                "'string'"
-            )
-        else:
-            expected_msg = (
-                'Failed validating attribute "instances.0.alias" in config for pack '
-                "\"dummy_pack_19\" (.*?): {'not': 'string'} is not of type "
-                "u'string'"
-            )
+        expected_msg = (
+            'Failed validating attribute "instances.0.alias" in config for pack '
+            "\"dummy_pack_19\" (.*?): {'not': 'string'} is not of type "
+            "'string'"
+        )
 
         self.assertRaisesRegexp(
             ValueError,

Diff for: st2common/tests/unit/test_param_utils.py

@@ -374,15 +374,7 @@ def test_unicode_value_casting(self):
             rendered=rendered, parameter_schemas=parameter_schemas
         )
 
-        if six.PY3:
-            expected = {"a1": ("unicode1 ٩(̾●̮̮̃̾•̃̾)۶ unicode2")}
-        else:
-            expected = {
-                "a1": (
-                    "unicode1 \xd9\xa9(\xcc\xbe\xe2\x97\x8f\xcc\xae\xcc\xae\xcc"
-                    "\x83\xcc\xbe\xe2\x80\xa2\xcc\x83\xcc\xbe)\xdb\xb6 unicode2"
-                )
-            }
+        expected = {"a1": ("unicode1 ٩(̾●̮̮̃̾•̃̾)۶ unicode2")}
 
         self.assertEqual(result, expected)
 
@@ -398,15 +390,7 @@ def test_get_finalized_params_with_casting_unicode_values(self):
             runner_param_info, action_param_info, params, action_context
         )
 
-        if six.PY3:
-            expected_action_params = {"a1": ("unicode1 ٩(̾●̮̮̃̾•̃̾)۶ unicode2")}
-        else:
-            expected_action_params = {
-                "a1": (
-                    "unicode1 \xd9\xa9(\xcc\xbe\xe2\x97\x8f\xcc\xae\xcc\xae\xcc"
-                    "\x83\xcc\xbe\xe2\x80\xa2\xcc\x83\xcc\xbe)\xdb\xb6 unicode2"
-                )
-            }
+        expected_action_params = {"a1": ("unicode1 ٩(̾●̮̮̃̾•̃̾)۶ unicode2")}
 
         self.assertEqual(r_runner_params, {})
         self.assertEqual(r_action_params, expected_action_params)

Diff for: st2common/tests/unit/test_service_setup.py

@@ -17,7 +17,6 @@
 
 import tempfile
 
-import six
 import mock
 
 from oslo_config.cfg import ConfigFilesNotFoundError
@@ -104,10 +103,7 @@ def tearDown(self):
     def test_no_logging_config_found(self):
         config.get_logging_config_path = mock_get_logging_config_path
 
-        if six.PY3:
-            expected_msg = ".*KeyError:.*"
-        else:
-            expected_msg = "No section: .*"
+        expected_msg = ".*KeyError:.*"
 
         self.assertRaisesRegexp(
             Exception,
@@ -134,14 +130,8 @@ def mock_get_logging_config_path():
 
         config.get_logging_config_path = mock_get_logging_config_path
 
-        if six.PY3:
-            expected_msg = "ValueError: Unknown level: 'invalid_log_level'"
-            exc_type = ValueError
-        else:
-            expected_msg = (
-                "Invalid log level selected. Log level names need to be all uppercase"
-            )
-            exc_type = KeyError
+        expected_msg = "ValueError: Unknown level: 'invalid_log_level'"
+        exc_type = ValueError
 
         self.assertRaisesRegexp(
             exc_type,