提交 18a32136 编写于 作者: R Roger A. Light

Fix tests.

上级 cc94fc8b
...@@ -31,20 +31,20 @@ try: ...@@ -31,20 +31,20 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "subscribe", subscribe_packet): paho_test.expect_packet(conn, "subscribe", subscribe_packet)
conn.send(suback_packet) conn.send(suback_packet)
paho_test.expect_packet(conn, "unsubscribe", unsubscribe_packet): paho_test.expect_packet(conn, "unsubscribe", unsubscribe_packet)
conn.send(unsuback_packet) conn.send(unsuback_packet)
conn.send(publish_packet) conn.send(publish_packet)
paho_test.expect_packet(conn, "publish", publish_packet_in): paho_test.expect_packet(conn, "publish", publish_packet_in)
conn.send(puback_packet_in) conn.send(puback_packet_in)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -31,20 +31,20 @@ try: ...@@ -31,20 +31,20 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "subscribe", subscribe_packet): paho_test.expect_packet(conn, "subscribe", subscribe_packet)
conn.send(suback_packet) conn.send(suback_packet)
paho_test.expect_packet(conn, "unsubscribe", unsubscribe_packet): paho_test.expect_packet(conn, "unsubscribe", unsubscribe_packet)
conn.send(unsuback_packet) conn.send(unsuback_packet)
conn.send(publish_packet) conn.send(publish_packet)
paho_test.expect_packet(conn, "publish", publish_packet_in): paho_test.expect_packet(conn, "publish", publish_packet_in)
conn.send(puback_packet_in) conn.send(puback_packet_in)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -28,14 +28,14 @@ try: ...@@ -28,14 +28,14 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(keepalive+10) conn.settimeout(keepalive+10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "pingreq", pingreq_packet): paho_test.expect_packet(conn, "pingreq", pingreq_packet)
time.sleep(1.0) time.sleep(1.0)
conn.send(pingresp_packet) conn.send(pingresp_packet)
paho_test.expect_packet(conn, "pingreq", pingreq_packet): paho_test.expect_packet(conn, "pingreq", pingreq_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -20,7 +20,7 @@ try: ...@@ -20,7 +20,7 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -22,11 +22,11 @@ try: ...@@ -22,11 +22,11 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet_ok) conn.send(connack_packet_ok)
# Connection is a success, so we expect a publish # Connection is a success, so we expect a publish
paho_test.expect_packet(conn, "publish", publish_packet): paho_test.expect_packet(conn, "publish", publish_packet)
conn.close() conn.close()
# Expect the client to quit here due to socket being closed # Expect the client to quit here due to socket being closed
client.wait(1) client.wait(1)
...@@ -36,7 +36,7 @@ try: ...@@ -36,7 +36,7 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet_failure) conn.send(connack_packet_failure)
# Expect the client to quit here due to socket being closed # Expect the client to quit here due to socket being closed
client.wait(1) client.wait(1)
......
...@@ -23,7 +23,7 @@ try: ...@@ -23,7 +23,7 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -23,7 +23,7 @@ try: ...@@ -23,7 +23,7 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -23,7 +23,7 @@ try: ...@@ -23,7 +23,7 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -25,7 +25,7 @@ try: ...@@ -25,7 +25,7 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -24,7 +24,7 @@ try: ...@@ -24,7 +24,7 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -24,7 +24,7 @@ try: ...@@ -24,7 +24,7 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -20,10 +20,10 @@ try: ...@@ -20,10 +20,10 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -34,13 +34,13 @@ try: ...@@ -34,13 +34,13 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "subscribe", subscribe_packet): paho_test.expect_packet(conn, "subscribe", subscribe_packet)
conn.send(suback_packet) conn.send(suback_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -34,13 +34,13 @@ try: ...@@ -34,13 +34,13 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "subscribe", subscribe_packet): paho_test.expect_packet(conn, "subscribe", subscribe_packet)
conn.send(suback_packet) conn.send(suback_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -34,13 +34,13 @@ try: ...@@ -34,13 +34,13 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "subscribe", subscribe_packet): paho_test.expect_packet(conn, "subscribe", subscribe_packet)
conn.send(suback_packet) conn.send(suback_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -24,13 +24,13 @@ try: ...@@ -24,13 +24,13 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "unsubscribe", unsubscribe_packet): paho_test.expect_packet(conn, "unsubscribe", unsubscribe_packet)
conn.send(unsuback_packet) conn.send(unsuback_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -36,11 +36,11 @@ try: ...@@ -36,11 +36,11 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
conn.send(publish_packet) conn.send(publish_packet)
paho_test.expect_packet(conn, "puback", puback_packet): paho_test.expect_packet(conn, "puback", puback_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -29,23 +29,23 @@ try: ...@@ -29,23 +29,23 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(15) conn.settimeout(15)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "publish", publish_packet): paho_test.expect_packet(conn, "publish", publish_packet)
# Disconnect client. It should reconnect. # Disconnect client. It should reconnect.
conn.close() conn.close()
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(15) conn.settimeout(15)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "retried publish", publish_packet_dup): paho_test.expect_packet(conn, "retried publish", publish_packet_dup)
conn.send(puback_packet) conn.send(puback_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -31,23 +31,23 @@ try: ...@@ -31,23 +31,23 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(5) conn.settimeout(5)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "publish", publish_packet): paho_test.expect_packet(conn, "publish", publish_packet)
# Disconnect client. It should reconnect. # Disconnect client. It should reconnect.
conn.close() conn.close()
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(15) conn.settimeout(15)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "retried publish", publish_dup_packet): paho_test.expect_packet(conn, "retried publish", publish_dup_packet)
conn.send(pubrec_packet) conn.send(pubrec_packet)
paho_test.expect_packet(conn, "pubrel", pubrel_packet): paho_test.expect_packet(conn, "pubrel", pubrel_packet)
# Disconnect client. It should reconnect. # Disconnect client. It should reconnect.
conn.close() conn.close()
...@@ -55,13 +55,13 @@ try: ...@@ -55,13 +55,13 @@ try:
conn.settimeout(15) conn.settimeout(15)
# Complete connection and message flow. # Complete connection and message flow.
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "retried pubrel", pubrel_packet): paho_test.expect_packet(conn, "retried pubrel", pubrel_packet)
conn.send(pubcomp_packet) conn.send(pubcomp_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -36,11 +36,11 @@ try: ...@@ -36,11 +36,11 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "publish", publish_packet): paho_test.expect_packet(conn, "publish", publish_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -36,11 +36,11 @@ try: ...@@ -36,11 +36,11 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "publish", publish_packet): paho_test.expect_packet(conn, "publish", publish_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -34,23 +34,23 @@ try: ...@@ -34,23 +34,23 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "publish", publish_packet): paho_test.expect_packet(conn, "publish", publish_packet)
# Disconnect client. It should reconnect. # Disconnect client. It should reconnect.
conn.close() conn.close()
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(15) conn.settimeout(15)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "retried publish", publish_packet_dup): paho_test.expect_packet(conn, "retried publish", publish_packet_dup)
conn.send(puback_packet) conn.send(puback_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -30,11 +30,11 @@ try: ...@@ -30,11 +30,11 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "publish", publish_packet): paho_test.expect_packet(conn, "publish", publish_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -30,11 +30,11 @@ try: ...@@ -30,11 +30,11 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "publish", publish_packet): paho_test.expect_packet(conn, "publish", publish_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -22,10 +22,10 @@ try: ...@@ -22,10 +22,10 @@ try:
(conn, address) = sock.accept() (conn, address) = sock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "publish", publish_packet): paho_test.expect_packet(conn, "publish", publish_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -30,10 +30,10 @@ try: ...@@ -30,10 +30,10 @@ try:
(conn, address) = ssock.accept() (conn, address) = ssock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -30,10 +30,10 @@ try: ...@@ -30,10 +30,10 @@ try:
(conn, address) = ssock.accept() (conn, address) = ssock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
...@@ -28,10 +28,10 @@ try: ...@@ -28,10 +28,10 @@ try:
(conn, address) = ssock.accept() (conn, address) = ssock.accept()
conn.settimeout(10) conn.settimeout(10)
paho_test.expect_packet(conn, "connect", connect_packet): paho_test.expect_packet(conn, "connect", connect_packet)
conn.send(connack_packet) conn.send(connack_packet)
paho_test.expect_packet(conn, "disconnect", disconnect_packet): paho_test.expect_packet(conn, "disconnect", disconnect_packet)
rc = 0 rc = 0
conn.close() conn.close()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册