Skip to content

Commit 13f2d73

Browse files
committed
Remove ble_wifi arg from shutdown namespace
Related interfaces will be removed after removing of specific namespaces
1 parent 3a5c39d commit 13f2d73

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

scripts/tests/chiptest/linux.py

+3-10
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def CreateNamespacesForAppTest(ble_wifi: bool = False):
144144
logging.warn("Some addresses look to still be tentative")
145145

146146

147-
def RemoveNamespaceForAppTest(ble_wifi: bool = False):
147+
def RemoveNamespaceForAppTest():
148148
"""
149149
Removes namespaces for a tool and app binaries previously created to simulate an
150150
isolated network. This tears down what was created in CreateNamespacesForAppTest.
@@ -165,13 +165,6 @@ def RemoveNamespaceForAppTest(ble_wifi: bool = False):
165165
"ip netns del app",
166166
]
167167

168-
if not ble_wifi:
169-
COMMANDS += [
170-
"ip link set dev eth-app-direct down",
171-
"ip link set dev eth-tool-direct down",
172-
"ip link delete eth-tool-direct",
173-
]
174-
175168
for command in COMMANDS:
176169
logging.debug("Executing '%s'" % command)
177170
if os.system(command) != 0:
@@ -189,8 +182,8 @@ def PrepareNamespacesForTestExecution(in_unshare: bool, ble_wifi: bool = False):
189182
CreateNamespacesForAppTest(ble_wifi)
190183

191184

192-
def ShutdownNamespaceForTestExecution(ble_wifi: bool = False):
193-
RemoveNamespaceForAppTest(ble_wifi)
185+
def ShutdownNamespaceForTestExecution():
186+
RemoveNamespaceForAppTest()
194187

195188

196189
class DbusTest:

scripts/tests/run_test_suite.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ def cleanup():
406406
virt_wifi.stop()
407407
virt_ble.stop()
408408
dbus.stop()
409-
chiptest.linux.ShutdownNamespaceForTestExecution(ble_wifi)
409+
chiptest.linux.ShutdownNamespaceForTestExecution()
410410

411411
for i in range(iterations):
412412
logging.info("Starting iteration %d" % (i + 1))

0 commit comments

Comments
 (0)