old_contents: #!/usr/bin/env python
  
  import struct
  import subprocess
  import socket
  import time
  
  import inspect, os, sys
  # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
  cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
  if cmd_subfolder not in sys.path:
      sys.path.insert(0, cmd_subfolder)
  
  import mosq_test
  
  rc = 1
  keepalive = 60
  connect_packet = mosq_test.gen_connect("will-null-topic", keepalive=keepalive, will_topic="", will_payload=struct.pack("!4sB7s", "will", 0, "message"))
  connack_packet = mosq_test.gen_connack(rc=2)
  
  broker = subprocess.Popen(['../../src/mosquitto', '-p', '1888'], stderr=subprocess.PIPE)
  
  try:
      time.sleep(0.5)
  
      sock = mosq_test.do_client_connect(connect_packet, connack_packet, timeout=30)
      rc = 0
      sock.close()
  finally:
      broker.terminate()
      broker.wait()
      if rc:
          (stdo, stde) = broker.communicate()
          print(stde)
  
  exit(rc)
  
  
new_contents: #!/usr/bin/env python
  
  import struct
  import subprocess
  import socket
  import time
  
  import inspect, os, sys
  # From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
  cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
  if cmd_subfolder not in sys.path:
      sys.path.insert(0, cmd_subfolder)
  
  import mosq_test
  
  rc = 1
  keepalive = 60
  connect_packet = mosq_test.gen_connect("will-null-topic", keepalive=keepalive, will_topic="", will_payload=struct.pack("!4sB7s", "will", 0, "message"))
  connack_packet = mosq_test.gen_connack(rc=2)
  
  broker = subprocess.Popen(['../../src/mosquitto', '-p', '1888'], stderr=subprocess.PIPE)
  
  try:
      time.sleep(0.5)
  
      sock = mosq_test.do_client_connect(connect_packet, "", timeout=30)
      rc = 0
      sock.close()
  finally:
      broker.terminate()
      broker.wait()
      if rc:
          (stdo, stde) = broker.communicate()
          print(stde)
  
  exit(rc)
  
  
subject: Fix test.