Merge pull request #925 from httprunner/v3

## 3.0.11 (2020-06-08)

**Changed**

- change: override variables
    (1) testcase: session variables > step variables > config variables
    (2) testsuite: testcase variables > config variables
    (3) testsuite testcase variables > testcase config variables

**Fixed**

- fix: incorrect summary success when testcase failed
- fix: reload to refresh previously loaded debugtalk module
- fix: escape $$ in variable value

docs/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Release History
 
+## 3.0.11 (2020-06-08)
+
+**Changed**
+
+- change: override variables
+    (1) testcase: session variables > step variables > config variables
+    (2) testsuite: testcase variables > config variables
+    (3) testsuite testcase variables > testcase config variables
+
+**Fixed**
+
+- fix: incorrect summary success when testcase failed
+- fix: reload to refresh previously loaded debugtalk module
+- fix: escape $$ in variable value
+
 ## 3.0.10 (2020-06-07)
 
 **Added**

docs/installation.md

@@ -6,20 +6,20 @@
 `HttpRunner` is available on [`PyPI`][PyPI] and can be installed through `pip`.
 
 ```bash
-$ pip install httprunner
+$ pip3 install httprunner
 ```
 
 If you want to keep up with the latest version, you can install with github repository url.
 
 ```bash
-$ pip install git+https://github.com/httprunner/httprunner.git@master
+$ pip3 install git+https://github.com/httprunner/httprunner.git@master
 ```
 
 If you have installed `HttpRunner` before and want to upgrade to the latest version, you can use the `-U` option.
 
 ```bash
-$ pip install -U httprunner
+$ pip3 install -U httprunner
-$ pip install -U git+https://github.com/httprunner/httprunner.git@master
+$ pip3 install -U git+https://github.com/httprunner/httprunner.git@master
 ```
 
 ## Check Installation
@@ -27,15 +27,15 @@ $ pip install -U git+https://github.com/httprunner/httprunner.git@master
 When HttpRunner is installed, 4 commands will be added in your system.
 
 - `httprunner`: main command, used for all functions
-- `hrun`: alias for `httprunner run`, used to run YAML/JSON testcases
+- `hrun`: alias for `httprunner run`, used to run YAML/JSON/pytest testcases
 - `hmake`: alias for `httprunner make`, used to convert YAML/JSON testcases to pytest files
 - `har2case`: alias for `httprunner har2case`, used to convert HAR to YAML/JSON testcases
 
 To see `HttpRunner` version:
 
 ```text
-$ httprunner -V
+$ httprunner -V  # hrun -V
-3.0.6
+3.0.10
 ```
 
 To see available options, run:

examples/httpbin/basic_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/httpbin/basic.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

examples/httpbin/hooks_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/httpbin/hooks.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

examples/httpbin/load_image_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/httpbin/load_image.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

examples/httpbin/upload_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/httpbin/upload.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

examples/httpbin/validate_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/httpbin/validate.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

examples/postman_echo/debugtalk.py

@@ -9,5 +9,9 @@ def sum_two(m, n):
     return m + n
 
 
-def get_variables():
+def get_testcase_config_variables():
-    return {"foo1": "session_bar1"}
+    return {"foo1": "testcase_config_bar1", "foo2": "testcase_config_bar2"}
+
+
+def get_testsuite_config_variables():
+    return {"foo1": "testsuite_config_bar1", "foo2": "testsuite_config_bar2"}

examples/postman_echo/request_methods/demo_testsuite.yml

@@ -1,15 +1,20 @@
 config:
     name: "demo testsuite"
-    variables: ${get_variables()}
+    variables: ${get_testsuite_config_variables()}
 
 testcases:
 -
     name: request with functions
     testcase: request_methods/request_with_functions.yml
     variables:
-        var1: testsuite_val1
+        foo1: testcase_ref_bar11
+        expect_foo1: testcase_ref_bar11
+        expect_foo2: testsuite_config_bar2
 -
     name: request with referenced testcase
     testcase: request_methods/request_with_testcase_reference.yml
     variables:
-        var2: testsuite_val2
+        foo1: testcase_ref_bar12
+        expect_foo1: testcase_ref_bar12
+        foo2: testcase_ref_bar22
+        expect_foo2: testcase_ref_bar22

examples/postman_echo/request_methods/demo_testsuite_yml/request_with_functions_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/postman_echo/request_methods/request_with_functions.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase
@@ -7,32 +7,39 @@ from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase
 class TestCaseRequestWithFunctions(HttpRunner):
     config = (
         Config("request with functions")
-        .variables(**{"var1": "testsuite_val1", "foo1": "session_bar1"})
+        .variables(
+            **{
+                "foo1": "testcase_ref_bar11",
+                "foo2": "testsuite_config_bar2",
+                "expect_foo1": "testcase_ref_bar11",
+                "expect_foo2": "testsuite_config_bar2",
+            }
+        )
         .base_url("https://postman-echo.com")
         .verify(False)
-        .export(*["session_foo2"])
+        .export(*["foo3"])
     )
 
     teststeps = [
         Step(
             RunRequest("get with params")
             .with_variables(
-                **{"foo1": "bar1", "foo2": "session_bar2", "sum_v": "${sum_two(1, 2)}"}
+                **{"foo1": "bar11", "foo2": "bar21", "sum_v": "${sum_two(1, 2)}"}
             )
             .get("/get")
             .with_params(**{"foo1": "$foo1", "foo2": "$foo2", "sum_v": "$sum_v"})
             .with_headers(**{"User-Agent": "HttpRunner/${get_httprunner_version()}"})
             .extract()
-            .with_jmespath("body.args.foo2", "session_foo2")
+            .with_jmespath("body.args.foo2", "foo3")
             .validate()
             .assert_equal("status_code", 200)
-            .assert_equal("body.args.foo1", "session_bar1")
+            .assert_equal("body.args.foo1", "bar11")
             .assert_equal("body.args.sum_v", "3")
-            .assert_equal("body.args.foo2", "session_bar2")
+            .assert_equal("body.args.foo2", "bar21")
         ),
         Step(
             RunRequest("post raw text")
-            .with_variables(**{"foo1": "hello world", "foo3": "$session_foo2"})
+            .with_variables(**{"foo1": "bar12", "foo3": "bar32"})
             .post("/post")
             .with_headers(
                 **{
@@ -41,18 +48,18 @@ class TestCaseRequestWithFunctions(HttpRunner):
                 }
             )
             .with_data(
-                "This is expected to be sent back as part of response body: $foo1-$foo3."
+                "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
             )
             .validate()
             .assert_equal("status_code", 200)
             .assert_equal(
                 "body.data",
-                "This is expected to be sent back as part of response body: session_bar1-session_bar2.",
+                "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar21.",
             )
         ),
         Step(
             RunRequest("post form data")
-            .with_variables(**{"foo1": "bar1", "foo2": "bar2"})
+            .with_variables(**{"foo2": "bar23"})
             .post("/post")
             .with_headers(
                 **{
@@ -60,11 +67,12 @@ class TestCaseRequestWithFunctions(HttpRunner):
                     "Content-Type": "application/x-www-form-urlencoded",
                 }
             )
-            .with_data("foo1=$foo1&foo2=$foo2")
+            .with_data("foo1=$foo1&foo2=$foo2&foo3=$foo3")
             .validate()
             .assert_equal("status_code", 200)
-            .assert_equal("body.form.foo1", "session_bar1")
+            .assert_equal("body.form.foo1", "$expect_foo1")
-            .assert_equal("body.form.foo2", "bar2")
+            .assert_equal("body.form.foo2", "bar23")
+            .assert_equal("body.form.foo3", "bar21")
         ),
     ]
 

examples/postman_echo/request_methods/demo_testsuite_yml/request_with_testcase_reference_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/postman_echo/request_methods/request_with_testcase_reference.yml
 
 import os
@@ -16,7 +16,14 @@ from examples.postman_echo.request_methods.request_with_functions_test import (
 class TestCaseRequestWithTestcaseReference(HttpRunner):
     config = (
         Config("request with referenced testcase")
-        .variables(**{"var2": "testsuite_val2", "foo1": "session_bar1"})
+        .variables(
+            **{
+                "foo1": "testcase_ref_bar12",
+                "expect_foo1": "testcase_ref_bar12",
+                "expect_foo2": "testcase_ref_bar22",
+                "foo2": "testcase_ref_bar22",
+            }
+        )
         .base_url("https://postman-echo.com")
         .verify(False)
     )
@@ -24,9 +31,11 @@ class TestCaseRequestWithTestcaseReference(HttpRunner):
     teststeps = [
         Step(
             RunTestCase("request with functions")
-            .with_variables(**{"foo1": "override_bar1"})
+            .with_variables(
+                **{"foo1": "testcase_ref_bar1", "expect_foo1": "testcase_ref_bar1"}
+            )
             .call(RequestWithFunctions)
-            .export(*["session_foo2"])
+            .export(*["foo3"])
         ),
         Step(
             RunRequest("post form data")
@@ -38,11 +47,11 @@ class TestCaseRequestWithTestcaseReference(HttpRunner):
                     "Content-Type": "application/x-www-form-urlencoded",
                 }
             )
-            .with_data("foo1=$foo1&foo2=$session_foo2")
+            .with_data("foo1=$foo1&foo2=$foo3")
             .validate()
             .assert_equal("status_code", 200)
-            .assert_equal("body.form.foo1", "session_bar1")
+            .assert_equal("body.form.foo1", "bar1")
-            .assert_equal("body.form.foo2", "session_bar2")
+            .assert_equal("body.form.foo2", "bar21")
         ),
     ]
 

examples/postman_echo/request_methods/hardcode_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/postman_echo/request_methods/hardcode.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

examples/postman_echo/request_methods/request_with_functions.yml

@@ -1,17 +1,20 @@
 config:
     name: "request methods testcase with functions"
     variables:
-        foo1: session_bar1
+        foo1: config_bar1
+        foo2: config_bar2
+        expect_foo1: config_bar1
+        expect_foo2: config_bar2
     base_url: "https://postman-echo.com"
     verify: False
-    export: ["session_foo2"]
+    export: ["foo3"]
 
 teststeps:
 -
     name: get with params
     variables:
-        foo1: bar1
+        foo1: bar11
-        foo2: session_bar2
+        foo2: bar21
         sum_v: "${sum_two(1, 2)}"
     request:
         method: GET
@@ -23,40 +26,40 @@ teststeps:
         headers:
             User-Agent: HttpRunner/${get_httprunner_version()}
     extract:
-        session_foo2: "body.args.foo2"
+        foo3: "body.args.foo2"
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.args.foo1", "session_bar1"]
+        - eq: ["body.args.foo1", "bar11"]
         - eq: ["body.args.sum_v", "3"]
-        - eq: ["body.args.foo2", "session_bar2"]
+        - eq: ["body.args.foo2", "bar21"]
 -
     name: post raw text
     variables:
-        foo1: "hello world"
+        foo1: "bar12"
-        foo3: "$session_foo2"
+        foo3: "bar32"
     request:
         method: POST
         url: /post
         headers:
             User-Agent: HttpRunner/${get_httprunner_version()}
             Content-Type: "text/plain"
-        data: "This is expected to be sent back as part of response body: $foo1-$foo3."
+        data: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.data", "This is expected to be sent back as part of response body: session_bar1-session_bar2."]
+        - eq: ["body.data", "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar21."]
 -
     name: post form data
     variables:
-        foo1: bar1
+        foo2: bar23
-        foo2: bar2
     request:
         method: POST
         url: /post
         headers:
             User-Agent: HttpRunner/${get_httprunner_version()}
             Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo2"
+        data: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.form.foo1", "session_bar1"]
+        - eq: ["body.form.foo1", "$expect_foo1"]
-        - eq: ["body.form.foo2", "bar2"]
+        - eq: ["body.form.foo2", "bar23"]
+        - eq: ["body.form.foo3", "bar21"]

examples/postman_echo/request_methods/request_with_functions_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/postman_echo/request_methods/request_with_functions.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase
@@ -7,32 +7,39 @@ from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase
 class TestCaseRequestWithFunctions(HttpRunner):
     config = (
         Config("request methods testcase with functions")
-        .variables(**{"foo1": "session_bar1"})
+        .variables(
+            **{
+                "foo1": "config_bar1",
+                "foo2": "config_bar2",
+                "expect_foo1": "config_bar1",
+                "expect_foo2": "config_bar2",
+            }
+        )
         .base_url("https://postman-echo.com")
         .verify(False)
-        .export(*["session_foo2"])
+        .export(*["foo3"])
     )
 
     teststeps = [
         Step(
             RunRequest("get with params")
             .with_variables(
-                **{"foo1": "bar1", "foo2": "session_bar2", "sum_v": "${sum_two(1, 2)}"}
+                **{"foo1": "bar11", "foo2": "bar21", "sum_v": "${sum_two(1, 2)}"}
             )
             .get("/get")
             .with_params(**{"foo1": "$foo1", "foo2": "$foo2", "sum_v": "$sum_v"})
             .with_headers(**{"User-Agent": "HttpRunner/${get_httprunner_version()}"})
             .extract()
-            .with_jmespath("body.args.foo2", "session_foo2")
+            .with_jmespath("body.args.foo2", "foo3")
             .validate()
             .assert_equal("status_code", 200)
-            .assert_equal("body.args.foo1", "session_bar1")
+            .assert_equal("body.args.foo1", "bar11")
             .assert_equal("body.args.sum_v", "3")
-            .assert_equal("body.args.foo2", "session_bar2")
+            .assert_equal("body.args.foo2", "bar21")
         ),
         Step(
             RunRequest("post raw text")
-            .with_variables(**{"foo1": "hello world", "foo3": "$session_foo2"})
+            .with_variables(**{"foo1": "bar12", "foo3": "bar32"})
             .post("/post")
             .with_headers(
                 **{
@@ -41,18 +48,18 @@ class TestCaseRequestWithFunctions(HttpRunner):
                 }
             )
             .with_data(
-                "This is expected to be sent back as part of response body: $foo1-$foo3."
+                "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
             )
             .validate()
             .assert_equal("status_code", 200)
             .assert_equal(
                 "body.data",
-                "This is expected to be sent back as part of response body: session_bar1-session_bar2.",
+                "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar21.",
             )
         ),
         Step(
             RunRequest("post form data")
-            .with_variables(**{"foo1": "bar1", "foo2": "bar2"})
+            .with_variables(**{"foo2": "bar23"})
             .post("/post")
             .with_headers(
                 **{
@@ -60,11 +67,12 @@ class TestCaseRequestWithFunctions(HttpRunner):
                     "Content-Type": "application/x-www-form-urlencoded",
                 }
             )
-            .with_data("foo1=$foo1&foo2=$foo2")
+            .with_data("foo1=$foo1&foo2=$foo2&foo3=$foo3")
             .validate()
             .assert_equal("status_code", 200)
-            .assert_equal("body.form.foo1", "session_bar1")
+            .assert_equal("body.form.foo1", "$expect_foo1")
-            .assert_equal("body.form.foo2", "bar2")
+            .assert_equal("body.form.foo2", "bar23")
+            .assert_equal("body.form.foo3", "bar21")
         ),
     ]
 

examples/postman_echo/request_methods/request_with_testcase_reference.yml

@@ -1,7 +1,9 @@
 config:
     name: "request methods testcase: reference testcase"
     variables:
-        foo1: session_bar1
+        foo1: testsuite_config_bar1
+        expect_foo1: testsuite_config_bar1
+        expect_foo2: config_bar2
     base_url: "https://postman-echo.com"
     verify: False
 
@@ -9,10 +11,11 @@ teststeps:
 -
     name: request with functions
     variables:
-        foo1: override_bar1
+        foo1: testcase_ref_bar1
+        expect_foo1: testcase_ref_bar1
     testcase: request_methods/request_with_functions.yml
     export:
-        - session_foo2
+        - foo3
 -
     name: post form data
     variables:
@@ -23,8 +26,8 @@ teststeps:
         headers:
             User-Agent: HttpRunner/${get_httprunner_version()}
             Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$session_foo2"
+        data: "foo1=$foo1&foo2=$foo3"
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.form.foo1", "session_bar1"]
+        - eq: ["body.form.foo1", "bar1"]
-        - eq: ["body.form.foo2", "session_bar2"]
+        - eq: ["body.form.foo2", "bar21"]

examples/postman_echo/request_methods/request_with_testcase_reference_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/postman_echo/request_methods/request_with_testcase_reference.yml
 
 import os
@@ -16,7 +16,13 @@ from examples.postman_echo.request_methods.request_with_functions_test import (
 class TestCaseRequestWithTestcaseReference(HttpRunner):
     config = (
         Config("request methods testcase: reference testcase")
-        .variables(**{"foo1": "session_bar1"})
+        .variables(
+            **{
+                "foo1": "testsuite_config_bar1",
+                "expect_foo1": "testsuite_config_bar1",
+                "expect_foo2": "config_bar2",
+            }
+        )
         .base_url("https://postman-echo.com")
         .verify(False)
     )
@@ -24,9 +30,11 @@ class TestCaseRequestWithTestcaseReference(HttpRunner):
     teststeps = [
         Step(
             RunTestCase("request with functions")
-            .with_variables(**{"foo1": "override_bar1"})
+            .with_variables(
+                **{"foo1": "testcase_ref_bar1", "expect_foo1": "testcase_ref_bar1"}
+            )
             .call(RequestWithFunctions)
-            .export(*["session_foo2"])
+            .export(*["foo3"])
         ),
         Step(
             RunRequest("post form data")
@@ -38,11 +46,11 @@ class TestCaseRequestWithTestcaseReference(HttpRunner):
                     "Content-Type": "application/x-www-form-urlencoded",
                 }
             )
-            .with_data("foo1=$foo1&foo2=$session_foo2")
+            .with_data("foo1=$foo1&foo2=$foo3")
             .validate()
             .assert_equal("status_code", 200)
-            .assert_equal("body.form.foo1", "session_bar1")
+            .assert_equal("body.form.foo1", "bar1")
-            .assert_equal("body.form.foo2", "session_bar2")
+            .assert_equal("body.form.foo2", "bar21")
         ),
     ]
 

examples/postman_echo/request_methods/request_with_variables.yml

@@ -1,6 +1,6 @@
 config:
     name: "request methods testcase with variables"
-    variables: ${get_variables()}
+    variables: ${get_testcase_config_variables()}
     base_url: "https://postman-echo.com"
     verify: False
 
@@ -8,8 +8,8 @@ teststeps:
 -
     name: get with params
     variables:
-        foo1: bar1
+        foo1: bar11
-        foo2: session_bar2
+        foo2: bar21
     request:
         method: GET
         url: /get
@@ -19,39 +19,39 @@ teststeps:
         headers:
             User-Agent: HttpRunner/3.0
     extract:
-        session_foo2: "body.args.foo2"
+        foo3: "body.args.foo2"
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.args.foo1", "session_bar1"]
+        - eq: ["body.args.foo1", "bar11"]
-        - eq: ["body.args.foo2", "session_bar2"]
+        - eq: ["body.args.foo2", "bar21"]
 -
     name: post raw text
     variables:
-        foo1: "hello world"
+        foo1: "bar12"
-        foo3: "$session_foo2"
+        foo3: "bar32"
     request:
         method: POST
         url: /post
         headers:
             User-Agent: HttpRunner/3.0
             Content-Type: "text/plain"
-        data: "This is expected to be sent back as part of response body: $foo1-$foo3."
+        data: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.data", "This is expected to be sent back as part of response body: session_bar1-session_bar2."]
+        - eq: ["body.data", "This is expected to be sent back as part of response body: bar12-testcase_config_bar2-bar21."]
 -
     name: post form data
     variables:
-        foo1: bar1
+        foo2: bar23
-        foo2: bar2
     request:
         method: POST
         url: /post
         headers:
             User-Agent: HttpRunner/3.0
             Content-Type: "application/x-www-form-urlencoded"
-        data: "foo1=$foo1&foo2=$foo2"
+        data: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.form.foo1", "session_bar1"]
+        - eq: ["body.form.foo1", "testcase_config_bar1"]
-        - eq: ["body.form.foo2", "bar2"]
+        - eq: ["body.form.foo2", "bar23"]
+        - eq: ["body.form.foo3", "bar21"]

examples/postman_echo/request_methods/request_with_variables_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/postman_echo/request_methods/request_with_variables.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase
@@ -7,7 +7,7 @@ from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase
 class TestCaseRequestWithVariables(HttpRunner):
     config = (
         Config("request methods testcase with variables")
-        .variables(**{"foo1": "session_bar1"})
+        .variables(**{"foo1": "testcase_config_bar1", "foo2": "testcase_config_bar2"})
         .base_url("https://postman-echo.com")
         .verify(False)
     )
@@ -15,37 +15,37 @@ class TestCaseRequestWithVariables(HttpRunner):
     teststeps = [
         Step(
             RunRequest("get with params")
-            .with_variables(**{"foo1": "bar1", "foo2": "session_bar2"})
+            .with_variables(**{"foo1": "bar11", "foo2": "bar21"})
             .get("/get")
             .with_params(**{"foo1": "$foo1", "foo2": "$foo2"})
             .with_headers(**{"User-Agent": "HttpRunner/3.0"})
             .extract()
-            .with_jmespath("body.args.foo2", "session_foo2")
+            .with_jmespath("body.args.foo2", "foo3")
             .validate()
             .assert_equal("status_code", 200)
-            .assert_equal("body.args.foo1", "session_bar1")
+            .assert_equal("body.args.foo1", "bar11")
-            .assert_equal("body.args.foo2", "session_bar2")
+            .assert_equal("body.args.foo2", "bar21")
         ),
         Step(
             RunRequest("post raw text")
-            .with_variables(**{"foo1": "hello world", "foo3": "$session_foo2"})
+            .with_variables(**{"foo1": "bar12", "foo3": "bar32"})
             .post("/post")
             .with_headers(
                 **{"User-Agent": "HttpRunner/3.0", "Content-Type": "text/plain"}
             )
             .with_data(
-                "This is expected to be sent back as part of response body: $foo1-$foo3."
+                "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
             )
             .validate()
             .assert_equal("status_code", 200)
             .assert_equal(
                 "body.data",
-                "This is expected to be sent back as part of response body: session_bar1-session_bar2.",
+                "This is expected to be sent back as part of response body: bar12-testcase_config_bar2-bar21.",
             )
         ),
         Step(
             RunRequest("post form data")
-            .with_variables(**{"foo1": "bar1", "foo2": "bar2"})
+            .with_variables(**{"foo2": "bar23"})
             .post("/post")
             .with_headers(
                 **{
@@ -53,11 +53,12 @@ class TestCaseRequestWithVariables(HttpRunner):
                     "Content-Type": "application/x-www-form-urlencoded",
                 }
             )
-            .with_data("foo1=$foo1&foo2=$foo2")
+            .with_data("foo1=$foo1&foo2=$foo2&foo3=$foo3")
             .validate()
             .assert_equal("status_code", 200)
-            .assert_equal("body.form.foo1", "session_bar1")
+            .assert_equal("body.form.foo1", "testcase_config_bar1")
-            .assert_equal("body.form.foo2", "bar2")
+            .assert_equal("body.form.foo2", "bar23")
+            .assert_equal("body.form.foo3", "bar21")
         ),
     ]
 

examples/postman_echo/request_methods/validate_with_functions.yml

@@ -26,4 +26,4 @@ teststeps:
     validate:
         - eq: ["status_code", 200]
         - eq: ["body.args.sum_v", "3"]
-#        - less_than: ["body.args.sum_v", "${sum_two(2, 2)}"]   TODO
+#        - less_than: ["body.args.sum_v", "${sum_two(2, 2)}"]   FIXME: TypeError: '<' not supported between instances of 'str' and 'int'

examples/postman_echo/request_methods/validate_with_functions_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/postman_echo/request_methods/validate_with_functions.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase

examples/postman_echo/request_methods/validate_with_variables.yml

@@ -39,7 +39,7 @@ teststeps:
         data: "This is expected to be sent back as part of response body: $foo1-$foo3."
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.data", "This is expected to be sent back as part of response body: session_bar1-$foo3."]
+        - eq: ["body.data", "This is expected to be sent back as part of response body: hello world-$foo3."]
 -
     name: post form data
     variables:

examples/postman_echo/request_methods/validate_with_variables_test.py

@@ -1,4 +1,4 @@
-# NOTE: Generated By HttpRunner v3.0.10
+# NOTE: Generated By HttpRunner v3.0.11
 # FROM: examples/postman_echo/request_methods/validate_with_variables.yml
 
 from httprunner import HttpRunner, Config, Step, RunRequest, RunTestCase
@@ -40,7 +40,7 @@ class TestCaseValidateWithVariables(HttpRunner):
             .assert_equal("status_code", 200)
             .assert_equal(
                 "body.data",
-                "This is expected to be sent back as part of response body: session_bar1-$foo3.",
+                "This is expected to be sent back as part of response body: hello world-$foo3.",
             )
         ),
         Step(

httprunner/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.0.10"
+__version__ = "3.0.11"
 __description__ = "One-stop solution for HTTP(S) testing."
 
 from httprunner.runner import HttpRunner

httprunner/cli.py

@@ -53,6 +53,7 @@ def main_run(extra_args) -> enum.IntEnum:
         extra_args_new.append("--tb=short")
 
     extra_args_new.extend(testcase_path_list)
+    logger.info(f"start to run tests with pytest. HttpRunner version: {__version__}")
     return pytest.main(extra_args_new)
 
 

httprunner/loader.py

@@ -371,6 +371,8 @@ def load_debugtalk_functions() -> Dict[Text, Callable]:
     """
     # load debugtalk.py module
     imported_module = importlib.import_module("debugtalk")
+    # reload to refresh previously loaded module
+    imported_module = importlib.reload(imported_module)
     return load_module_functions(imported_module)
 
 

httprunner/make.py

@@ -21,9 +21,8 @@ from httprunner.loader import (
     load_testsuite,
     load_project_meta,
 )
-from httprunner.parser import parse_data
 from httprunner.response import uniform_validator
-from httprunner.utils import ensure_file_path_valid
+from httprunner.utils import ensure_file_path_valid, override_config_variables
 
 """ cache converted pytest files, avoid duplicate making
 """
@@ -407,11 +406,18 @@ def make_testsuite(testsuite: Dict) -> NoReturn:
         if "verify" in testsuite_config:
             testcase_dict["config"]["verify"] = testsuite_config["verify"]
         # override variables
+        # testsuite testcase variables > testsuite config variables
         testcase_variables = convert_variables(
             testcase.get("variables", {}), testcase_path
         )
-        testcase_variables.update(testsuite_variables)
+        testcase_variables = override_config_variables(
-        testcase_dict["config"]["variables"] = testcase_variables
+            testcase_variables, testsuite_variables
+        )
+        # testsuite testcase variables > testcase config variables
+        testcase_dict["config"]["variables"] = convert_variables(
+            testcase_dict["config"].get("variables", {}), testcase_path
+        )
+        testcase_dict["config"]["variables"].update(testcase_variables)
 
         # make testcase
         testcase_pytest_path = make_testcase(testcase_dict, testsuite_dir)
@@ -447,18 +453,18 @@ def __make(tests_path: Text) -> NoReturn:
             continue
 
         if not isinstance(test_content, Dict):
-            raise exceptions.FileFormatError(
+            logger.warning(f"test content not in dict format. \npath: {test_file}")
-                f"test content not in dict format: {test_content}"
+            continue
-            )
 
         # api in v2 format, convert to v3 testcase
         if "request" in test_content and "name" in test_content:
             test_content = ensure_testcase_v3_api(test_content)
 
         if "config" not in test_content:
-            raise exceptions.FileFormatError(
+            logger.warning(
-                f"miss config part in testcase/testsuite: {test_content}"
+                f"Invalid testcase/testsuite: missing config part in testcase/testsuite.\npath: {test_file}"
             )
+            continue
 
         test_content.setdefault("config", {})["path"] = test_file
 

httprunner/parser.py

@@ -44,11 +44,11 @@ def build_url(base_url, path):
         raise exceptions.ParamsError("base url missed!")
 
 
-def regex_findall_variables(content: Text) -> List[Text]:
+def regex_findall_variables(raw_string: Text) -> List[Text]:
     """ extract all variable names from content, which is in format $variable
 
     Args:
-        content (str): string content
+        raw_string (str): string content
 
     Returns:
         list: variables list extracted from string content
@@ -68,14 +68,40 @@ def regex_findall_variables(content: Text) -> List[Text]:
 
     """
     try:
-        vars_list = []
+        match_start_position = raw_string.index("$", 0)
-        for var_tuple in variable_regex_compile.findall(content):
+    except ValueError:
-            vars_list.append(var_tuple[0] or var_tuple[1])
-        return vars_list
-    except TypeError as ex:
-        capture_exception(ex)
         return []
 
+    vars_list = []
+    while match_start_position < len(raw_string):
+
+        # Notice: notation priority
+        # $$ > $var
+
+        # search $$
+        dollar_match = dolloar_regex_compile.match(raw_string, match_start_position)
+        if dollar_match:
+            match_start_position = dollar_match.end()
+            continue
+
+        # search variable like ${var} or $var
+        var_match = variable_regex_compile.match(raw_string, match_start_position)
+        if var_match:
+            var_name = var_match.group(1) or var_match.group(2)
+            vars_list.append(var_name)
+            match_start_position = var_match.end()
+            continue
+
+        curr_position = match_start_position
+        try:
+            # find next $ location
+            match_start_position = raw_string.index("$", curr_position + 1)
+        except ValueError:
+            # break while loop
+            break
+
+    return vars_list
+
 
 def regex_findall_functions(content: Text) -> List[Text]:
     """ extract all functions from string content, which are in format ${fun()}

httprunner/runner.py

@@ -2,7 +2,7 @@ import os
 import time
 import uuid
 from datetime import datetime
-from typing import List, Dict, Text, NoReturn, Union
+from typing import List, Dict, Text, NoReturn
 
 try:
     import allure
@@ -21,6 +21,7 @@ from httprunner.loader import load_project_meta, load_testcase_file
 from httprunner.parser import build_url, parse_data, parse_variables_mapping
 from httprunner.response import ResponseObject
 from httprunner.testcase import Config, Step
+from httprunner.utils import override_config_variables
 from httprunner.models import (
     TConfig,
     TStep,
@@ -39,7 +40,7 @@ class HttpRunner(object):
     config: Config
     teststeps: List[Step]
 
-    success: bool = True  # indicate testcase execution result
+    success: bool = False  # indicate testcase execution result
     __config: TConfig
     __teststeps: List[TStep]
     __project_meta: ProjectMeta = None
@@ -216,7 +217,7 @@ class HttpRunner(object):
         finally:
             # save request & response meta data
             self.__session.data.validators = resp_obj.validation_results
-            self.success &= self.__session.data.success
+            self.success = self.__session.data.success
             # save step data
             step_data.success = self.__session.data.success
             step_data.data = self.__session.data
@@ -265,7 +266,7 @@ class HttpRunner(object):
         step_data.data = case_result.get_step_datas()  # list of step data
         step_data.export_vars = case_result.get_export_variables()
         step_data.success = case_result.success
-        self.success &= case_result.success
+        self.success = case_result.success
 
         if step_data.export_vars:
             logger.info(f"export variables: {step_data.export_vars}")
@@ -324,20 +325,26 @@ class HttpRunner(object):
 
         # run teststeps
         for step in self.__teststeps:
-            # update with config variables
+            # override variables
-            step.variables.update(self.__config.variables)
+            # session variables (extracted from pre step) > step variables
-            # update with session variables extracted from pre step
             step.variables.update(self.__session_variables)
+            # step variables > testcase config variables
+            step.variables = override_config_variables(
+                step.variables, self.__config.variables
+            )
+
             # parse variables
             step.variables = parse_variables_mapping(
                 step.variables, self.__project_meta.functions
             )
+
             # run step
             if USE_ALLURE:
                 with allure.step(f"step: {step.name}"):
                     extract_mapping = self.__run_step(step)
             else:
                 extract_mapping = self.__run_step(step)
+
             # save extracted variables to session variables
             self.__session_variables.update(extract_mapping)
 
@@ -413,10 +420,10 @@ class HttpRunner(object):
         log_handler = logger.add(self.__log_path, level="DEBUG")
 
         # parse config name
-        variables = self.__config.variables
+        config_variables = self.__config.variables
-        variables.update(self.__session_variables)
+        config_variables.update(self.__session_variables)
         self.__config.name = parse_data(
-            self.__config.name, variables, self.__project_meta.functions
+            self.__config.name, config_variables, self.__project_meta.functions
         )
 
         if USE_ALLURE:

httprunner/scaffold.py

@@ -42,16 +42,20 @@ def create_scaffold(project_name):
 config:
     name: "request methods testcase with functions"
     variables:
-        foo1: session_bar1
+        foo1: config_bar1
+        foo2: config_bar2
+        expect_foo1: config_bar1
+        expect_foo2: config_bar2
     base_url: "https://postman-echo.com"
     verify: False
+    export: ["foo3"]
 
 teststeps:
 -
     name: get with params
     variables:
-        foo1: bar1
+        foo1: bar11
-        foo2: session_bar2
+        foo2: bar21
         sum_v: "${sum_two(1, 2)}"
     request:
         method: GET
@@ -63,43 +67,78 @@ teststeps:
         headers:
             User-Agent: HttpRunner/${get_httprunner_version()}
     extract:
-        session_foo2: "body.args.foo2"
+        foo3: "body.args.foo2"
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.args.foo1", "session_bar1"]
+        - eq: ["body.args.foo1", "bar11"]
         - eq: ["body.args.sum_v", "3"]
-        - eq: ["body.args.foo2", "session_bar2"]
+        - eq: ["body.args.foo2", "bar21"]
 -
     name: post raw text
     variables:
-        foo1: "hello world"
+        foo1: "bar12"
-        foo3: "$session_foo2"
+        foo3: "bar32"
     request:
         method: POST
         url: /post
         headers:
             User-Agent: HttpRunner/${get_httprunner_version()}
             Content-Type: "text/plain"
-        data: "This is expected to be sent back as part of response body: $foo1-$foo3."
+        data: "This is expected to be sent back as part of response body: $foo1-$foo2-$foo3."
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.data", "This is expected to be sent back as part of response body: session_bar1-session_bar2."]
+        - eq: ["body.data", "This is expected to be sent back as part of response body: bar12-$expect_foo2-bar21."]
+-
+    name: post form data
+    variables:
+        foo2: bar23
+    request:
+        method: POST
+        url: /post
+        headers:
+            User-Agent: HttpRunner/${get_httprunner_version()}
+            Content-Type: "application/x-www-form-urlencoded"
+        data: "foo1=$foo1&foo2=$foo2&foo3=$foo3"
+    validate:
+        - eq: ["status_code", 200]
+        - eq: ["body.form.foo1", "$expect_foo1"]
+        - eq: ["body.form.foo2", "bar23"]
+        - eq: ["body.form.foo3", "bar21"]
 """
     demo_testcase_with_ref_content = """
 config:
     name: "request methods testcase: reference testcase"
     variables:
-        foo1: session_bar1
+        foo1: testsuite_config_bar1
+        expect_foo1: testsuite_config_bar1
+        expect_foo2: config_bar2
     base_url: "https://postman-echo.com"
     verify: False
 
 teststeps:
 -
-    name: request with referenced testcase
+    name: request with functions
     variables:
-        foo1: override_bar1
+        foo1: testcase_ref_bar1
-    # NOTICE: relative testcase path based on debugtalk.py
+        expect_foo1: testcase_ref_bar1
     testcase: testcases/demo_testcase_request.yml
+    export:
+        - foo3
+-
+    name: post form data
+    variables:
+        foo1: bar1
+    request:
+        method: POST
+        url: /post
+        headers:
+            User-Agent: HttpRunner/${get_httprunner_version()}
+            Content-Type: "application/x-www-form-urlencoded"
+        data: "foo1=$foo1&foo2=$foo3"
+    validate:
+        - eq: ["status_code", 200]
+        - eq: ["body.form.foo1", "bar1"]
+        - eq: ["body.form.foo2", "bar21"]
 """
     ignore_content = "\n".join(
         [".env", "reports/*", "__pycache__/*", "*.pyc", ".python-version", "logs/*"]

httprunner/utils.py

@@ -1,4 +1,5 @@
 import collections
+import copy
 import json
 import os.path
 import platform
@@ -11,6 +12,7 @@ from loguru import logger
 
 from httprunner import __version__
 from httprunner import exceptions
+from httprunner.models import VariablesMapping
 
 
 def init_sentry_sdk():
@@ -223,3 +225,23 @@ class ExtendJSONEncoder(json.JSONEncoder):
             return super(ExtendJSONEncoder, self).default(obj)
         except (UnicodeDecodeError, TypeError):
             return repr(obj)
+
+
+def override_config_variables(
+    step_variables: VariablesMapping, config_variables: VariablesMapping
+) -> VariablesMapping:
+    """ override variables:
+            testcase step variables > testcase config variables
+            testsuite testcase variables > testsuite config variables
+    """
+    step_new_variables = {}
+    for key, value in step_variables.items():
+        if f"${key}" == value:
+            # e.g. {"base_url": "$base_url"}
+            continue
+
+        step_new_variables[key] = value
+
+    variables = copy.deepcopy(config_variables)
+    variables.update(step_new_variables)
+    return variables

mkdocs.yml

@@ -3,7 +3,7 @@
 # $ pip install mkdocs-material   # 5.2.2
 
 # Project information
-site_name: HttpRunner V3.x 中文使用文档
+site_name: HttpRunner V3.x Docs
 site_description: HttpRunner V3.x User Documentation
 site_author: 'debugtalk'
 
@@ -28,7 +28,7 @@ theme:
 
 # Google Analytics
 google_analytics:
-    - 'UA-114587036-2'
+    - 'UA-114587036-3'
     - 'auto'
 
 # Extensions

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "httprunner"
-version = "3.0.10"
+version = "3.0.11"
 description = "One-stop solution for HTTP(S) testing."
 license = "Apache-2.0"
 readme = "README.md"

tests/compat_test.py

@@ -1,11 +1,14 @@
 import os
 import unittest
 
-from httprunner import compat, exceptions
+from httprunner import compat, exceptions, loader
 from httprunner.compat import convert_variables
 
 
 class TestCompat(unittest.TestCase):
+    def setUp(self):
+        loader.project_meta = None
+
     def test_convert_variables(self):
         raw_variables = [{"var1": 1}, {"var2": "val2"}]
         self.assertEqual(

tests/data/a-b.c/1.yml

@@ -1,7 +1,8 @@
 config:
     name: "request methods testcase with functions"
     variables:
-        foo1: session_bar1
+        foo1: config_bar1
+        foo2: config_bar2
     base_url: "https://postman-echo.com"
     verify: False
 
@@ -10,7 +11,6 @@ teststeps:
     name: get with params
     variables:
         foo1: bar1
-        foo2: session_bar2
         sum_v: "${sum_two(1, 2)}"
     request:
         method: GET
@@ -25,6 +25,6 @@ teststeps:
         session_foo2: "body.args.foo2"
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.args.foo1", "session_bar1"]
+        - eq: ["body.args.foo1", "bar1"]
         - eq: ["body.args.sum_v", "3"]
-        - eq: ["body.args.foo2", "session_bar2"]
+        - eq: ["body.args.foo2", "config_bar2"]

tests/data/a-b.c/2 3.yml

@@ -1,22 +1,18 @@
 config:
     name: "reference testcase unittest for abnormal folder path"
-    variables:
-        foo1: session_bar1
     base_url: "https://postman-echo.com"
     verify: False
 
 teststeps:
 -
     name: request with functions
-    variables:
-        foo1: override_bar1
     testcase: 1.yml
     export:
         - session_foo2
 -
     name: post form data
     variables:
-        foo1: bar1
+        foo1: bar12
     request:
         method: POST
         url: /post
@@ -26,5 +22,5 @@ teststeps:
         data: "foo1=$foo1&foo2=$session_foo2"
     validate:
         - eq: ["status_code", 200]
-        - eq: ["body.form.foo1", "session_bar1"]
+        - eq: ["body.form.foo1", "bar12"]
-        - eq: ["body.form.foo2", "session_bar2"]
+        - eq: ["body.form.foo2", "config_bar2"]

tests/parser_test.py

@@ -3,6 +3,7 @@ import unittest
 
 from httprunner import parser
 from httprunner.exceptions import VariableNotFound, FunctionNotFound
+from httprunner.parser import regex_findall_variables
 
 
 class TestParserBasic(unittest.TestCase):
@@ -25,6 +26,19 @@ class TestParserBasic(unittest.TestCase):
         self.assertEqual(parser.parse_string_value("$var"), "$var")
         self.assertEqual(parser.parse_string_value("${func}"), "${func}")
 
+    def test_regex_findall_variables(self):
+        self.assertEqual(regex_findall_variables("$variable"), ["variable"])
+        self.assertEqual(regex_findall_variables("${variable}123"), ["variable"])
+        self.assertEqual(regex_findall_variables("/blog/$postid"), ["postid"])
+        self.assertEqual(regex_findall_variables("/$var1/$var2"), ["var1", "var2"])
+        self.assertEqual(regex_findall_variables("abc"), [])
+        self.assertEqual(regex_findall_variables("Z:2>1*0*1+1$a"), ["a"])
+        self.assertEqual(regex_findall_variables("Z:2>1*0*1+1$$a"), [])
+        self.assertEqual(regex_findall_variables("Z:2>1*0*1+1$$$a"), ["a"])
+        self.assertEqual(regex_findall_variables("Z:2>1*0*1+1$$$$a"), [])
+        self.assertEqual(regex_findall_variables("Z:2>1*0*1+1$$a$b"), ["b"])
+        self.assertEqual(regex_findall_variables("Z:2>1*0*1+1$$a$$b"), [])
+
     def test_extract_variables(self):
         self.assertEqual(parser.extract_variables("$var"), {"var"})
         self.assertEqual(parser.extract_variables("$var123"), {"var123"})
@@ -40,6 +54,7 @@ class TestParserBasic(unittest.TestCase):
             parser.extract_variables("${gen_md5($TOKEN, $data, $random)}"),
             {"TOKEN", "data", "random"},
         )
+        self.assertEqual(parser.extract_variables("Z:2>1*0*1+1$$1"), set())
 
     def test_parse_function_params(self):
         self.assertEqual(parser.parse_function_params(""), {"args": [], "kwargs": {}})

tests/utils_test.py

@@ -4,7 +4,11 @@ import os
 import unittest
 
 from httprunner import loader, utils
-from httprunner.utils import ensure_file_path_valid, ExtendJSONEncoder
+from httprunner.utils import (
+    ensure_file_path_valid,
+    ExtendJSONEncoder,
+    override_config_variables,
+)
 
 
 class TestUtils(unittest.TestCase):
@@ -129,3 +133,11 @@ class TestUtils(unittest.TestCase):
             json.dumps(data)
 
         json.dumps(data, cls=ExtendJSONEncoder)
+
+    def test_override_config_variables(self):
+        step_variables = {"base_url": "$base_url", "foo1": "bar1"}
+        config_variables = {"base_url": "https://httpbin.org", "foo1": "bar111"}
+        self.assertEqual(
+            override_config_variables(step_variables, config_variables),
+            {"base_url": "https://httpbin.org", "foo1": "bar1"},
+        )