diff --git a/hrp/boomer.go b/hrp/boomer.go index a736f909..2a7e9621 100644 --- a/hrp/boomer.go +++ b/hrp/boomer.go @@ -102,7 +102,7 @@ func (b *HRPBoomer) convertBoomerTask(testcase *TestCase, rendezvousList []*Rend var parameterVariables map[string]interface{} // iterate through all parameter iterators and update case variables - for _, it := range testcase.Config.ParametersSetting.Iterators { + for _, it := range sessionRunner.parsedConfig.ParametersSetting.Iterators { if it.HasNext() { parameterVariables = it.Next() } diff --git a/hrp/parser_test.go b/hrp/parser_test.go index a0311a71..38fa5cc9 100644 --- a/hrp/parser_test.go +++ b/hrp/parser_test.go @@ -763,28 +763,41 @@ func TestParseParameters(t *testing.T) { { map[string]interface{}{ "username-password": fmt.Sprintf("${parameterize(%s/account.csv)}", hrpExamplesDir), - "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}}, + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}, + }, 6, }, { map[string]interface{}{ - "username-password": [][]interface{}{{"test1", "111111"}, {"test2", "222222"}, {"test3", "333333"}}, - "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}, - "app_version": []interface{}{0.3}}, + "username-password": [][]interface{}{ + {"test1", "111111"}, + {"test2", "222222"}, + {"test3", "333333"}, + }, + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}, + "app_version": []interface{}{0.3}, + }, 6, }, { map[string]interface{}{ - "username-password": [][]interface{}{{"test1", "111111"}, {"test2", "222222"}, {"test3", "333333"}}, - "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}, - "app_version": []interface{}{0.3, 0.4, 0.5}}, + "username-password": [][]interface{}{ + {"test1", "111111"}, + {"test2", "222222"}, + {"test3", "333333"}, + }, + "user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}, + "app_version": []interface{}{0.3, 0.4, 0.5}, + }, 18, }, { - map[string]interface{}{}, 0, + map[string]interface{}{}, + 0, }, { - nil, 0, + nil, + 0, }, } for _, data := range testData { @@ -832,7 +845,10 @@ func TestParseSlice(t *testing.T) { }{ { "username-password", - []map[string]interface{}{{"username": "test1", "password": 111111, "other": "111"}, {"username": "test2", "password": 222222, "other": "222"}}, + []map[string]interface{}{ + {"username": "test1", "password": 111111, "other": "111"}, + {"username": "test2", "password": 222222, "other": "222"}, + }, []map[string]interface{}{ {"username": "test1", "password": 111111}, {"username": "test2", "password": 222222}, @@ -840,7 +856,10 @@ func TestParseSlice(t *testing.T) { }, { "username-password", - [][]string{{"test1", "111111"}, {"test2", "222222"}}, + [][]string{ + {"test1", "111111"}, + {"test2", "222222"}, + }, []map[string]interface{}{ {"username": "test1", "password": "111111"}, {"username": "test2", "password": "222222"}, diff --git a/hrp/session.go b/hrp/session.go index 0c37525a..478fbe03 100644 --- a/hrp/session.go +++ b/hrp/session.go @@ -25,7 +25,7 @@ type SessionRunner struct { } func (r *SessionRunner) resetSession() { - log.Info().Msg("clear session runner") + log.Info().Msg("reset session runner") r.sessionVariables = make(map[string]interface{}) r.transactions = make(map[string]map[transactionType]time.Time) r.startTime = time.Now() diff --git a/httprunner/parser.py b/httprunner/parser.py index 192521da..7bf6e9ef 100644 --- a/httprunner/parser.py +++ b/httprunner/parser.py @@ -3,7 +3,7 @@ import builtins import os import re from typing import Any, Callable, Dict, List, Set, Text -from urllib.parse import urljoin, urlparse +from urllib.parse import urlparse from loguru import logger from sentry_sdk import capture_exception