Merge branch 'master' into mail

ate/testcase.py

@@ -37,11 +37,11 @@ def parse_variables(content, variable_mapping):
     """
     variable_name_list = get_contain_variables(content)
     for variable_name in variable_name_list:
-        variable_value = variable_mapping.get(variable_name)
-        if variable_value is None:
+        if variable_name not in variable_mapping:
             raise ParamsError(
                 "%s is not defined in bind variables!" % variable_name)
 
+        variable_value = variable_mapping.get(variable_name)
         if "${}".format(variable_name) == content:
             # content is a variable
             content = variable_value

tests/test_testcase.py

@@ -58,7 +58,8 @@ class TestcaseParserUnittest(unittest.TestCase):
             "var_2": "def",
             "var_3": 123,
             "var_4": {"a": 1},
-            "var_5": True
+            "var_5": True,
+            "var_6": None
         }
         self.assertEqual(
             testcase.parse_variables("$var_1", variable_mapping),
@@ -104,6 +105,10 @@ class TestcaseParserUnittest(unittest.TestCase):
             testcase.parse_variables("abc$var_4", variable_mapping),
             "abc{'a': 1}"
         )
+        self.assertEqual(
+            testcase.parse_variables("$var_6", variable_mapping),
+            None
+        )
 
     def test_is_functon(self):
         self.assertTrue(testcase.is_functon("${func()}"))