new_contents: from saluttest import exec_test
  from avahitest import AvahiAnnouncer, AvahiListener
  from avahitest import get_host_name
  import avahi
  
  from xmppstream import setup_stream_listener, connect_to_stream, OutgoingXmppiChatStream
  from servicetest import make_channel_proxy
  
  from twisted.words.xish import xpath, domish
  
  
  import time
  import dbus
  
  CHANNEL_TYPE_TEXT = "org.freedesktop.Telepathy.Channel.Type.Text"
  HT_CONTACT = 1
  HT_CONTACT_LIST = 3
  TEXT_MESSAGE_TYPE_NORMAL = dbus.UInt32(0)
  
  INCOMING_MESSAGE = "Test 123"
  
  def test(q, bus, conn):
      conn.Connect()
      q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L])
      basic_txt = { "txtvers": "1", "status": "avail" }
  
      self_handle = conn.GetSelfHandle()
      self_handle_name =  conn.InspectHandles(HT_CONTACT, [self_handle])[0]
  
      contact_name = "test-ichat-incoming-msg@" + get_host_name()
      listener, port = setup_stream_listener(q, contact_name)
  
      announcer = AvahiAnnouncer(contact_name, "_presence._tcp", port, basic_txt)
  
      publish_handle = conn.RequestHandles(HT_CONTACT_LIST, ["publish"])[0]
      publish = conn.RequestChannel(
          "org.freedesktop.Telepathy.Channel.Type.ContactList",
          HT_CONTACT_LIST, publish_handle, False)
  
      handle = 0
      # Wait until the record shows up in publish
      while handle == 0:
          e = q.expect('dbus-signal', signal='MembersChanged', path=publish)
          for h in e.args[1]:
              name = conn.InspectHandles(HT_CONTACT, [h])[0]
              if name == contact_name:
                  handle = h
  
      # Create a connection to send msg stanza
      AvahiListener(q).listen_for_service("_presence._tcp")
      e = q.expect('service-added', name = self_handle_name,
          protocol = avahi.PROTO_INET)
      service = e.service
      service.resolve()
  
      e = q.expect('service-resolved', service = service)
  
      outbound = connect_to_stream(q, contact_name,
          self_handle_name, str(e.pt), e.port, OutgoingXmppiChatStream)
  
      e = q.expect('connection-result')
      assert e.succeeded, e.reason
      e = q.expect('stream-opened', connection = outbound)
  
      msg = domish.Element((None, 'message'))
      msg['to'] = self_handle_name
      msg['type'] = 'chat'
      boddy = msg.addElement('body', content='hi')
      outbound.send(msg)
  
      e = q.expect('dbus-signal', signal='Received')
      assert e.args[2] == handle
      assert e.args[3] == TEXT_MESSAGE_TYPE_NORMAL
      assert e.args[5] == "hi"
  
  if __name__ == '__main__':
      exec_test(test)
  
subject: add test-ichat-incoming-msg.py