kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/gitlab_api_error_with_python3' into 'master'
ci: fix fetch submodule error on python3 See merge request espressif/esp-idf!6961pull/4494/head
commit
563227d9f8
|
@ -32,6 +32,7 @@ class SubModule(object):
|
||||||
|
|
||||||
def _get_commit_id(self, path):
|
def _get_commit_id(self, path):
|
||||||
output = subprocess.check_output(["git", "ls-tree", "HEAD", path])
|
output = subprocess.check_output(["git", "ls-tree", "HEAD", path])
|
||||||
|
output = output.decode()
|
||||||
# example output: 160000 commit d88a262fbdf35e5abb372280eb08008749c3faa0 components/esp_wifi/lib
|
# example output: 160000 commit d88a262fbdf35e5abb372280eb08008749c3faa0 components/esp_wifi/lib
|
||||||
match = self.GIT_LS_TREE_OUTPUT_PATTERN.search(output)
|
match = self.GIT_LS_TREE_OUTPUT_PATTERN.search(output)
|
||||||
return match.group(1)
|
return match.group(1)
|
||||||
|
|
|
@ -15,7 +15,7 @@ class Gitlab(object):
|
||||||
config_data_from_env = os.getenv("PYTHON_GITLAB_CONFIG")
|
config_data_from_env = os.getenv("PYTHON_GITLAB_CONFIG")
|
||||||
if config_data_from_env:
|
if config_data_from_env:
|
||||||
# prefer to load config from env variable
|
# prefer to load config from env variable
|
||||||
with tempfile.NamedTemporaryFile(delete=False) as temp_file:
|
with tempfile.NamedTemporaryFile("w", delete=False) as temp_file:
|
||||||
temp_file.write(config_data_from_env)
|
temp_file.write(config_data_from_env)
|
||||||
config_files = [temp_file.name]
|
config_files = [temp_file.name]
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -226,7 +226,7 @@ def run_one_normal_case(dut, one_case, junit_test_case):
|
||||||
err_msg = "Reset Check Failed: \r\n\tExpected: {}\r\n\tGet: {}".format(one_case["reset"],
|
err_msg = "Reset Check Failed: \r\n\tExpected: {}\r\n\tGet: {}".format(one_case["reset"],
|
||||||
exception_reset_list)
|
exception_reset_list)
|
||||||
Utility.console_log(err_msg, color="orange")
|
Utility.console_log(err_msg, color="orange")
|
||||||
junit_test_case.add_error_info(err_msg)
|
junit_test_case.add_failure_info(err_msg)
|
||||||
one_case_finish(result)
|
one_case_finish(result)
|
||||||
|
|
||||||
while not test_finish:
|
while not test_finish:
|
||||||
|
|
Ładowanie…
Reference in New Issue