3ed2814a1e
print and logger.info() were directing output to different locations (stdout and stderr, respectively) which resulted in buildbot showing reordered entries. Use logger consistently to avoid that. Signed-hostap: Jouni Malinen <j@w1.fi>
40 lines
1.1 KiB
Python
40 lines
1.1 KiB
Python
#!/usr/bin/python
|
|
#
|
|
# hwsim testing utilities
|
|
# Copyright (c) 2013, Jouni Malinen <j@w1.fi>
|
|
#
|
|
# This software may be distributed under the terms of the BSD license.
|
|
# See README for more details.
|
|
|
|
import os
|
|
import subprocess
|
|
import logging
|
|
logger = logging.getLogger(__name__)
|
|
|
|
def test_connectivity(ifname1, ifname2):
|
|
if os.path.isfile("../../mac80211_hwsim/tools/hwsim_test"):
|
|
hwsim_test = "../../mac80211_hwsim/tools/hwsim_test"
|
|
else:
|
|
hwsim_test = "hwsim_test"
|
|
cmd = ["sudo",
|
|
hwsim_test,
|
|
ifname1,
|
|
ifname2]
|
|
try:
|
|
s = subprocess.check_output(cmd)
|
|
logger.debug(s)
|
|
except subprocess.CalledProcessError, e:
|
|
logger.info("hwsim failed: " + str(e.returncode))
|
|
logger.info(e.output)
|
|
raise
|
|
|
|
def test_connectivity_p2p(dev1, dev2):
|
|
ifname1 = dev1.group_ifname if dev1.group_ifname else dev1.ifname
|
|
ifname2 = dev2.group_ifname if dev2.group_ifname else dev2.ifname
|
|
test_connectivity(ifname1, ifname2)
|
|
|
|
def test_connectivity_sta(dev1, dev2):
|
|
ifname1 = dev1.ifname
|
|
ifname2 = dev2.ifname
|
|
test_connectivity(ifname1, ifname2)
|