Merge pull request #2737 from polybassa/catch_#2736

Try to catch issue #2736

Author: gpotter2

test/tools/isotpscanner.uts

@@ -126,10 +126,9 @@ assert expected_output in plain_str(std_err)
 = Test show help
 
 result = subprocess.Popen([sys.executable, "scapy/tools/automotive/isotpscanner.py", "--help"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-std_out, std_err = result.communicate()
+std_out, _ = result.communicate()
 expected_output = plain_str(b'Scan for open ISOTP-Sockets.')
 
-assert not std_err
 assert result.wait() == 0
 assert expected_output in plain_str(std_out)
 
@@ -268,9 +267,6 @@ assert 0 == send_returncode
 assert returncode1 == 0
 assert returncode2 == 0
 
-assert std_err1 == None
-assert std_err2 == None
-
 for out in expected_output:
     assert plain_str(out) in plain_str(std_out1 + std_out2)
 
@@ -302,9 +298,6 @@ assert 0 == send_returncode
 assert returncode1 == 0
 assert returncode2 == 0
 
-assert std_err1 == None
-assert std_err2 == None
-
 for out in expected_output:
     assert plain_str(out) in plain_str(std_out1 + std_out2)
 
@@ -338,9 +331,6 @@ assert returncode1 == 0 == returncode2
 
 expected_output = [b'sid=0x601', b'did=0x700', b'padding=False', b'extended_addr=0xbb', b'extended_rx_addr=0xaa']
 
-assert std_err1 == None
-assert std_err2 == None
-
 for out in expected_output:
     assert plain_str(out) in plain_str(std_out1 + std_out2)
 

test/tools/obdscanner.uts

@@ -136,7 +136,6 @@ assert expected_output in plain_str(std_err)
 result = subprocess.Popen([sys.executable, "scapy/tools/automotive/obdscanner.py", "--help"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 assert result.wait() == 0
 std_out, std_err = result.communicate()
-assert not std_err
 expected_output = plain_str(b'Scan for all possible obd service classes and their subfunctions.')
 assert expected_output in plain_str(std_out)
 
@@ -245,7 +244,6 @@ with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e8, 0x7e0, basecls=OBD,
         tester.send(b"\x01\xff\xff\xff\xff")
         sim.join(timeout=10)
     expected_output = ["5 requests were sent, 4 answered", "2 requests were sent, 1 answered", "1 requests were sent, 1 answered"]
-    assert std_err1 == b'' and std_err2 == b''
     for out in expected_output:
         assert bytes_encode(out) in bytes_encode(std_out1) or bytes_encode(out) in bytes_encode(std_out2)  
 
@@ -291,7 +289,6 @@ with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e8, 0x7e0, basecls=OBD,
         tester.send(b"\x01\xff\xff\xff\xff")
         sim.join(timeout=10)
     expected_output = ["5 requests were sent, 4 answered"]
-    assert std_err1 == b'' and std_err2 == b''
     for out in expected_output:
         assert bytes_encode(out) in bytes_encode(std_out1) or bytes_encode(out) in bytes_encode(std_out2)
 
@@ -319,7 +316,6 @@ with new_can_socket0() as isocan, ISOTPSocket(isocan, 0x7e8, 0x7e0, basecls=OBD,
     finally:
         tester.send(b"\x01\xff\xff\xff\xff")
         sim.join(timeout=10)
-    assert std_err1 == b'' and std_err2 == b''
     expected_output = ["256 requests were sent", "1 requests were sent, 1 answered"]
     for out in expected_output:
         assert bytes_encode(out) in bytes_encode(std_out1) or bytes_encode(out) in bytes_encode(std_out2)