From a116c651f90150e25f5173efddd6ebef415af692 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Thu, 15 Nov 2018 19:58:26 +0800
Subject: [PATCH] remove unused utils functions

---
 httprunner/utils.py | 74 ---------------------------------------------
 tests/test_utils.py | 45 ---------------------------
 2 files changed, 119 deletions(-)

diff --git a/httprunner/utils.py b/httprunner/utils.py
index 5ba9a161..d1ccc4a8 100644
--- a/httprunner/utils.py
+++ b/httprunner/utils.py
@@ -13,14 +13,6 @@ from httprunner import exceptions, logger
 from httprunner.compat import OrderedDict, basestring, is_py2
 
 
-def remove_prefix(text, prefix):
-    """ remove prefix from text
-    """
-    if text.startswith(prefix):
-        return text[len(prefix):]
-    return text
-
-
 def set_os_environ(variables_mapping):
     """ set variables mapping to os.environ
     """
@@ -222,30 +214,6 @@ def deepcopy_dict(data):
         return copied_data
 
 
-def update_ordered_dict(ordered_dict, override_mapping):
-    """ override ordered_dict with new mapping.
-
-    Args:
-        ordered_dict (OrderDict): original ordered dict
-        override_mapping (dict): new variables mapping
-
-    Returns:
-        OrderDict: new overrided variables mapping.
-
-    Examples:
-        >>> ordered_dict = OrderDict({"a": 1, "b": 2})
-        >>> override_mapping = {"a": 3, "c": 4}
-        >>> update_ordered_dict(ordered_dict, override_mapping)
-            OrderDict({"a": 3, "b": 2, "c": 4})
-
-    """
-    new_ordered_dict = copy.copy(ordered_dict)
-    for var, value in override_mapping.items():
-        new_ordered_dict.update({var: value})
-
-    return new_ordered_dict
-
-
 def ensure_mapping_format(variables):
     """ ensure variables are in mapping format.
 
@@ -281,48 +249,6 @@ def ensure_mapping_format(variables):
     return variables_ordered_dict
 
 
-def override_mapping_list(variables, new_mapping):
-    """ override variables with new mapping.
-
-    Args:
-        variables (list): variables list
-            [
-                {"var_a": 1},
-                {"var_b": "world"}
-            ]
-        new_mapping (dict): overrided variables mapping
-            {
-                "var_a": "hello"
-            }
-
-    Returns:
-        OrderedDict: overrided variables mapping.
-
-    Examples:
-        >>> variables = [
-                {"var_a": 1},
-                {"var_b": "world"}
-            ]
-        >>> new_mapping = {
-                "var_a": "hello"
-            }
-        >>> override_mapping_list(variables, new_mapping)
-            OrderedDict(
-                {
-                    "var_a": "hello",
-                    "var_b": "world"
-                }
-            )
-
-    """
-    variables_ordered_dict = ensure_mapping_format(variables)
-
-    return update_ordered_dict(
-        variables_ordered_dict,
-        new_mapping
-    )
-
-
 def get_testcase_io(testcase):
     """ get testcase input(variables) and output.
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index d9c86183..4965fd71 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -9,14 +9,6 @@ from tests.base import ApiServerUnittest
 
 class TestUtils(ApiServerUnittest):
 
-    def test_remove_prefix(self):
-        full_url = "http://debugtalk.com/post/123"
-        prefix = "http://debugtalk.com"
-        self.assertEqual(
-            utils.remove_prefix(full_url, prefix),
-            "/post/123"
-        )
-
     def test_set_os_environ(self):
         self.assertNotIn("abc", os.environ)
         variables_mapping = {
@@ -234,43 +226,6 @@ class TestUtils(ApiServerUnittest):
         self.assertEqual(id(new_data["c"]), id(data["c"]))
         # self.assertEqual(id(new_data["d"]), id(data["d"]))
 
-    def test_update_ordered_dict(self):
-        map_list = [
-            {"a": 1},
-            {"b": 2}
-        ]
-        ordered_dict = utils.ensure_mapping_format(map_list)
-        override_mapping = {"a": 3, "c": 4}
-        new_dict = utils.update_ordered_dict(ordered_dict, override_mapping)
-        self.assertEqual(3, new_dict["a"])
-        self.assertEqual(4, new_dict["c"])
-
-    def test_override_variables_binds(self):
-        map_list = [
-            {"a": 1},
-            {"b": 2}
-        ]
-        override_mapping = {"a": 3, "c": 4}
-        new_dict = utils.override_mapping_list(map_list, override_mapping)
-        self.assertEqual(3, new_dict["a"])
-        self.assertEqual(4, new_dict["c"])
-
-        map_list = OrderedDict(
-            {
-                "a": 1,
-                "b": 2
-            }
-        )
-        override_mapping = {"a": 3, "c": 4}
-        new_dict = utils.override_mapping_list(map_list, override_mapping)
-        self.assertEqual(3, new_dict["a"])
-        self.assertEqual(4, new_dict["c"])
-
-        map_list = "invalid"
-        override_mapping = {"a": 3, "c": 4}
-        with self.assertRaises(exceptions.ParamsError):
-            utils.override_mapping_list(map_list, override_mapping)
-
     def test_create_scaffold(self):
         project_name = "projectABC"
         utils.create_scaffold(project_name)