Skip to content

Commit 4ffc51d

Browse files
committed
Merge branch 'update_submodule/release_v1.3' into 'release/v1.3'
[v1.3] Update the chip submdoule to latest v1.3-branch See merge request app-frameworks/esp-matter!1036
2 parents 427b40d + 5027f20 commit 4ffc51d

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ variables:
2525
IDF_CHECKOUT_REF: "v5.2.1"
2626
# This variable represents the short hash of the connectedhomeip submodule.
2727
# Note: Do change this short hash on submodule update MRs.
28-
CHIP_SHORT_HASH: "593d5c6f63"
28+
CHIP_SHORT_HASH: "bfc4bac20c"
2929
DOCKER_IMAGE_NAME: "espressif/chip-idf"
3030

3131
.add_gitlab_ssh_key: &add_gitlab_ssh_key |

examples/pytest_esp_matter_light.py

+17-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
import netifaces
1010
from typing import Tuple
1111
from pytest_embedded import Dut
12+
import os
13+
import yaml
14+
1215

1316
CURRENT_DIR_LIGHT = str(pathlib.Path(__file__).parent)+'/light'
1417
CHIP_TOOL_EXE = str(pathlib.Path(__file__).parent)+ '/../connectedhomeip/connectedhomeip/out/host/chip-tool'
@@ -137,9 +140,20 @@ def test_matter_commissioning_c6(dut:Dut) -> None:
137140

138141
# get the host interface name
139142
def get_host_interface_name() -> str:
140-
interfaces = netifaces.interfaces()
141-
interface_name = [s for s in interfaces if 'wl' in s][0]
142-
return str(interface_name)
143+
home_dir = os.path.expanduser("~")
144+
config_path = os.path.join(home_dir, "config", "env_config.yml")
145+
if os.path.exists(config_path):
146+
with open(config_path, 'r') as file:
147+
config = yaml.safe_load(file)
148+
interface_name = config.get("interface_name")
149+
if interface_name:
150+
return str(interface_name)
151+
else:
152+
print("Warning: Configuration file found but 'interface_name' is not defined.")
153+
154+
if "eth1" in netifaces.interfaces():
155+
return "eth1"
156+
raise Exception("No valid network interface found. Please ensure 'eth1' exists or configure 'interface_name' in config/env_config file.")
143157

144158

145159
# reset host interface

0 commit comments

Comments
 (0)