diff --git a/test/util_datac0.py b/test/util_datac0.py index 4d0ce4ce..71e47faa 100644 --- a/test/util_datac0.py +++ b/test/util_datac0.py @@ -297,5 +297,5 @@ def t_datac0_2( sock.SOCKET_QUEUE.queue ), f"{item} not found in {str(sock.SOCKET_QUEUE.queue)}" - assert '"arq":"session","status":"close"' in str(sock.SOCKET_QUEUE.queue) + assert '"arq":"session","dxcallsign":"AA0AA","status":"close"' in str(sock.SOCKET_QUEUE.queue) log.warning("station2: Exiting!") diff --git a/test/util_datac0_negative.py b/test/util_datac0_negative.py index 4163362e..d1252e8d 100644 --- a/test/util_datac0_negative.py +++ b/test/util_datac0_negative.py @@ -287,7 +287,10 @@ def t_datac0_2( # Allow enough time for this side to receive the disconnect frame. timeout = time.time() + timeout_duration - while '"arq":"session","status":"close"' not in str(sock.SOCKET_QUEUE.queue): + while '"arq":"session", "dxcallsign": "AA2BB-0", "status":"close"' not in str(sock.SOCKET_QUEUE.queue): + + + if time.time() > timeout: log.warning("station2", TIMEOUT=True, queue=str(sock.SOCKET_QUEUE.queue)) break @@ -303,5 +306,5 @@ def t_datac0_2( sock.SOCKET_QUEUE.queue ), f"{item} found in {str(sock.SOCKET_QUEUE.queue)}" - assert '"arq":"session","status":"close"' in str(sock.SOCKET_QUEUE.queue) + assert '"arq":"session", "dxcallsign": "AA2BB-0", "status":"close"' in str(sock.SOCKET_QUEUE.queue) log.warning("station2: Exiting!") diff --git a/tnc/static.py b/tnc/static.py index 3a7e70cc..b824e2b6 100644 --- a/tnc/static.py +++ b/tnc/static.py @@ -25,7 +25,7 @@ TNCPROCESS: subprocess.Popen MYCALLSIGN: bytes = b"AA0AA" MYCALLSIGN_CRC: bytes = b"A" -DXCALLSIGN: bytes = b"AA0AA" +DXCALLSIGN: bytes = b"ZZ9YY" DXCALLSIGN_CRC: bytes = b"A" MYGRID: bytes = b""