diff --git a/.gitignore b/.gitignore index 416944046d..9d4ca57a6c 100644 --- a/.gitignore +++ b/.gitignore @@ -90,4 +90,4 @@ tags features/FEATURE_BLE/targets/TARGET_CORDIO/stack_backup/ .pytest_cache -log \ No newline at end of file +log diff --git a/TEST_APPS/testcases/netsocket/TCPSERVER_ACCEPT.py b/TEST_APPS/testcases/netsocket/TCPSERVER_ACCEPT.py index ac46657b8d..a1711a5669 100644 --- a/TEST_APPS/testcases/netsocket/TCPSERVER_ACCEPT.py +++ b/TEST_APPS/testcases/netsocket/TCPSERVER_ACCEPT.py @@ -12,35 +12,37 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ -from icetea_lib.bench import Bench -from interface import interfaceUp, interfaceDown + import threading import time +from icetea_lib.bench import Bench +from interface import interfaceUp, interfaceDown + class Testcase(Bench): def __init__(self): Bench.__init__(self, name="TCPSERVER_ACCEPT", - title = "TCPSERVER_ACCEPT", - purpose = "Test that TCPServer::bind(), TCPServer::listen() and TCPServer::accept() works", - status = "released", - component= ["mbed-os", "netsocket"], - author = "Juha Ylinen ", + title="TCPSERVER_ACCEPT", + purpose="Test that TCPServer::bind(), TCPServer::listen() and TCPServer::accept() works", + status="released", + component=["mbed-os", "netsocket"], + author="Juha Ylinen ", type="smoke", subtype="socket", requirements={ "duts": { - '*': { #requirements for all nodes - "count":2, - "type": "hardware", - "application": {"name": "TEST_APPS-device-socket_app"} - }, - "1": {"nick": "dut1"}, - "2": {"nick": "dut2"} + '*': { # requirements for all nodes + "count": 2, + "type": "hardware", + "application": {"name": "TEST_APPS-device-socket_app"} + }, + "1": {"nick": "dut1"}, + "2": {"nick": "dut2"} } } - ) + ) def setup(self): interface = interfaceUp(self, ["dut1"]) @@ -50,10 +52,10 @@ class Testcase(Bench): def clientThread(self): self.logger.info("Starting") - time.sleep(5) #wait accept from server + time.sleep(5) # wait accept from server self.command("dut2", "socket " + str(self.client_socket_id) + " open") - self.command("dut2", "socket " + str(self.client_socket_id) + " connect " + str(self.server_ip) + " " + str(self.used_port)) - + self.command("dut2", "socket " + str(self.client_socket_id) + " connect " + str(self.server_ip) + " " + str( + self.used_port)) def case(self): self.used_port = 2000 @@ -73,20 +75,20 @@ class Testcase(Bench): zero = response.timedelta self.client_socket_id = int(response.parsed['socket_id']) - #Create a thread which calls client connect() + # Create a thread which calls client connect() t = threading.Thread(name='clientThread', target=self.clientThread) t.start() wait = 5 response = self.command("dut1", "socket " + str(server_base_socket_id) + " accept " + str(server_socket_id)) - response.verify_response_duration(expected = wait, zero = zero, threshold_percent = 10, break_in_fail = True) + response.verify_response_duration(expected=wait, zero=zero, threshold_percent=10, break_in_fail=True) socket_id = int(response.parsed['socket_id']) t.join() self.command("dut1", "socket " + str(socket_id) + " send hello") response = self.command("dut2", "socket " + str(self.client_socket_id) + " recv 5") - data = response.parsed['data'].replace(":","") + data = response.parsed['data'].replace(":", "") if data != "hello": raise TestStepFail("Received data doesn't match the sent data") @@ -95,7 +97,6 @@ class Testcase(Bench): self.command("dut1", "socket " + str(server_base_socket_id) + " delete") self.command("dut2", "socket " + str(self.client_socket_id) + " delete") - def teardown(self): interfaceDown(self, ["dut1"]) interfaceDown(self, ["dut2"]) diff --git a/TEST_APPS/testcases/netsocket/TCPSOCKET_ECHOTEST_BURST_SHORT.py b/TEST_APPS/testcases/netsocket/TCPSOCKET_ECHOTEST_BURST_SHORT.py index f2af345311..d4f2df0bf1 100644 --- a/TEST_APPS/testcases/netsocket/TCPSOCKET_ECHOTEST_BURST_SHORT.py +++ b/TEST_APPS/testcases/netsocket/TCPSOCKET_ECHOTEST_BURST_SHORT.py @@ -12,10 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ -from icetea_lib.bench import Bench, TestStepFail import random import string +from icetea_lib.bench import Bench, TestStepFail + class Testcase(Bench): def __init__(self): @@ -31,9 +32,9 @@ class Testcase(Bench): requirements={ "duts": { '*': { # requirements for all nodes - "count": 1, - "type": "hardware", - "application": {"name": "TEST_APPS-device-socket_app"} + "count": 1, + "type": "hardware", + "application": {"name": "TEST_APPS-device-socket_app"} }, "1": {"nick": "dut1"}, } diff --git a/TEST_APPS/testcases/netsocket/generate_test_data.py b/TEST_APPS/testcases/netsocket/generate_test_data.py index 283f7325bf..38400fe487 100644 --- a/TEST_APPS/testcases/netsocket/generate_test_data.py +++ b/TEST_APPS/testcases/netsocket/generate_test_data.py @@ -19,6 +19,7 @@ This script is intended to be a common test data generator. Currently it implements randomUppercaseAsciiString, randomLowercaseAsciiString methods. ''' + def randomUppercaseAsciiString(length): return ''.join(random.choice(string.ascii_uppercase) for i in range(length)) diff --git a/TEST_APPS/testcases/netsocket/interface.py b/TEST_APPS/testcases/netsocket/interface.py index 80a3b3cd28..82cc2acbb2 100644 --- a/TEST_APPS/testcases/netsocket/interface.py +++ b/TEST_APPS/testcases/netsocket/interface.py @@ -13,15 +13,17 @@ See the License for the specific language governing permissions and limitations under the License. """ from icetea_lib.TestStepError import TestStepFail + ''' This interface script is intended to be a common library to be used in testcase scripts by testers. It delegates setUp and tearDown functions with different provided network interface types using setUp() and tearDown() methods. ''' + def interfaceUp(tc, duts): interfaces = {} for dut in duts: - interface = {dut:{"ipv4": None, "ipv6": None}} + interface = {dut: {"ipv4": None, "ipv6": None}} resp = tc.command("%s" % dut, "ifup") @@ -35,6 +37,7 @@ def interfaceUp(tc, duts): interfaces.update(interface) return interfaces + def interfaceDown(tc, duts): for dut in duts: tc.command(dut, "ifdown")