← Back to branch summary

~ubuntu-branches/ubuntu/precise/telepathy-mission-control-5/precise

« back to all changes in this revision

Viewing changes to test/twisted/mctest.py

Tags: upstream-5.5.0
Import upstream version 5.5.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/twisted/mctest.py
22
22
 
23
23
import base64
24
24
import os
25
 
import sha
26
25
import sys
27
26
 
28
27
import constants as cs
825
824
 
826
825
    q.dbus_return(e.message, conn.bus_name, conn.object_path, signature='so')
827
826
 
 
827
    if has_requests:
 
828
        expect_before_connect.append(
 
829
                servicetest.EventPattern('dbus-method-call',
 
830
                    interface=cs.PROPERTIES_IFACE, method='GetAll',
 
831
                    args=[cs.CONN_IFACE_REQUESTS],
 
832
                    path=conn.object_path, handled=True))
 
833
 
828
834
    if expect_before_connect:
829
835
        events = list(q.expect_many(*expect_before_connect))
 
836
        if has_requests:
 
837
            del events[-1]
830
838
    else:
831
839
        events = []
832
840
 
836
844
 
837
845
    expect_after_connect = list(expect_after_connect)
838
846
 
839
 
    if has_requests:
840
 
        expect_after_connect.append(
841
 
                servicetest.EventPattern('dbus-method-call',
842
 
                    interface=cs.PROPERTIES_IFACE, method='GetAll',
843
 
                    args=[cs.CONN_IFACE_REQUESTS],
844
 
                    path=conn.object_path, handled=True))
845
 
    else:
 
847
    if not has_requests:
846
848
        expect_after_connect.append(
847
849
                servicetest.EventPattern('dbus-method-call',
848
850
                    interface=cs.CONN, method='ListChannels', args=[],
850
852
 
851
853
    events = events + list(q.expect_many(*expect_after_connect))
852
854
 
853
 
    del events[-1]
 
855
    if not has_requests:
 
856
        del events[-1]
854
857
 
855
858
    if events:
856
859
        return (conn,) + tuple(events)