sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up GSource and signal handler ID tear down

Browse Source
This commit is contained in:
Dan Williams 2007-04-26 10:48:49 -04:00
parent 2d2e1368fb
commit 57592601cc
1 changed files with 195 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

411
tests/presence/test-ps-bindings.py
View File

@ -67,87 +67,92 @@ def get_ps():
class GenericTestCase(unittest.TestCase): class GenericTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self._pspid = start_ps() self._pspid = start_ps()
self._success = False
self._err = ""
self._signals = []
self._sources = []
def tearDown(self): def tearDown(self):
# Remove all signal handlers
for (obj, sid) in self._signals:
obj.disconnect(sid)
for source in self._sources:
gobject.source_remove(source)
if self._pspid > 0: if self._pspid > 0:
stop_ps(self._pspid) stop_ps(self._pspid)
self._pspid = -1 self._pspid = -1
def _handle_error(self, err, user_data): def _handle_success(self):
user_data["success"] = False self._success = True
user_data["err"] = str(err)
gtk.main_quit() gtk.main_quit()
def cleanup(self, user_data): def _handle_error(self, err):
if user_data.has_key("sources"): self._success = False
for source in user_data["sources"]: self._err = str(err)
gobject.source_remove(source) gtk.main_quit()
class BuddyTests(GenericTestCase): class BuddyTests(GenericTestCase):
def _testOwner_helper(self, user_data): def _testOwner_helper(self):
try: try:
ps = get_ps() ps = get_ps()
except RuntimeError, err: except RuntimeError, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
try: try:
owner = ps.get_owner() owner = ps.get_owner()
except RuntimeError, err: except RuntimeError, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
user_data["success"] = True self._owner = owner
user_data["owner"] = owner self._handle_success()
gtk.main_quit()
return False return False
def testOwner(self): def testOwner(self):
user_data = {"success": False, "err": "", "owner": None} gobject.idle_add(self._testOwner_helper)
gobject.idle_add(self._testOwner_helper, user_data)
gtk.main() gtk.main()
assert user_data["success"] == True, user_data["err"] assert self._success == True, "Test unsuccessful."
assert user_data["owner"], "Owner could not be found." assert self._owner, "Owner could not be found."
owner = user_data["owner"] assert self._owner.props.key == mockps._OWNER_PUBKEY, "Owner public key doesn't match expected"
assert owner.props.key == mockps._OWNER_PUBKEY, "Owner public key doesn't match expected" assert self._owner.props.nick == mockps._OWNER_NICK, "Owner nickname doesn't match expected"
assert owner.props.nick == mockps._OWNER_NICK, "Owner nickname doesn't match expected" assert self._owner.props.color == mockps._OWNER_COLOR, "Owner color doesn't match expected"
assert owner.props.color == mockps._OWNER_COLOR, "Owner color doesn't match expected"
_BA_PUBKEY = "akjadskjjfahfdahfdsahjfhfewaew3253232832832q098qewa98fdsafa98fa" _BA_PUBKEY = "akjadskjjfahfdahfdsahjfhfewaew3253232832832q098qewa98fdsafa98fa"
_BA_NICK = "BuddyAppearedTestBuddy" _BA_NICK = "BuddyAppearedTestBuddy"
_BA_COLOR = "#23adfb,#56bb11" _BA_COLOR = "#23adfb,#56bb11"
def _testBuddyAppeared_helper_timeout(self, user_data): def _testBuddyAppeared_helper_timeout(self):
self._handle_error("Timeout waiting for buddy-appeared signal", user_data) self._handle_error("Timeout waiting for buddy-appeared signal")
return False return False
def _testBuddyAppeared_helper_cb(self, ps, buddy, user_data): def _testBuddyAppeared_helper_cb(self, ps, buddy):
user_data["buddy"] = buddy self._buddy = buddy
user_data["success"] = True self._handle_success()
gtk.main_quit()
def _testBuddyAppeared_helper(self, user_data): def _testBuddyAppeared_helper(self):
ps = get_ps() ps = get_ps()
sid = ps.connect('buddy-appeared', self._testBuddyAppeared_helper_cb, user_data) sid = ps.connect('buddy-appeared', self._testBuddyAppeared_helper_cb)
user_data["sources"].append(sid) self._signals.append((ps, sid))
# Wait 5 seconds max for signal to be emitted # Wait 5 seconds max for signal to be emitted
sid = gobject.timeout_add(5000, self._testBuddyAppeared_helper_timeout, user_data) sid = gobject.timeout_add(5000, self._testBuddyAppeared_helper_timeout)
user_data["sources"].append(sid) self._sources.append(sid)
busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE, busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE,
mockps._PRESENCE_PATH) mockps._PRESENCE_PATH)
try: try:
testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE) testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
try: try:
testps.AddBuddy(self._BA_PUBKEY, self._BA_NICK, self._BA_COLOR) testps.AddBuddy(self._BA_PUBKEY, self._BA_NICK, self._BA_COLOR)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
return False return False
@ -156,18 +161,16 @@ class BuddyTests(GenericTestCase):
ps = get_ps() ps = get_ps()
assert ps, "Couldn't get presence service" assert ps, "Couldn't get presence service"
user_data = {"success": False, "err": "", "buddy": None, "sources": []} self._buddy = None
gobject.idle_add(self._testBuddyAppeared_helper, user_data) gobject.idle_add(self._testBuddyAppeared_helper)
gtk.main() gtk.main()
self.cleanup(user_data)
assert user_data["success"] == True, user_data["err"] assert self._success == True, "Test unsuccessful."
assert user_data["buddy"], "Buddy was not received" assert self._buddy, "Buddy was not received"
buddy = user_data["buddy"] assert self._buddy.props.key == self._BA_PUBKEY, "Public key doesn't match expected"
assert buddy.props.key == self._BA_PUBKEY, "Public key doesn't match expected" assert self._buddy.props.nick == self._BA_NICK, "Nickname doesn't match expected"
assert buddy.props.nick == self._BA_NICK, "Nickname doesn't match expected" assert self._buddy.props.color == self._BA_COLOR, "Color doesn't match expected"
assert buddy.props.color == self._BA_COLOR, "Color doesn't match expected"
# Try to get buddy by public key # Try to get buddy by public key
buddy2 = ps.get_buddy(self._BA_PUBKEY) buddy2 = ps.get_buddy(self._BA_PUBKEY)
@ -176,44 +179,43 @@ class BuddyTests(GenericTestCase):
assert buddy2.props.nick == self._BA_NICK, "Nickname doesn't match expected" assert buddy2.props.nick == self._BA_NICK, "Nickname doesn't match expected"
assert buddy2.props.color == self._BA_COLOR, "Color doesn't match expected" assert buddy2.props.color == self._BA_COLOR, "Color doesn't match expected"
def _testBuddyDisappeared_helper_timeout(self, user_data): def _testBuddyDisappeared_helper_timeout(self):
self._handle_error("Timeout waiting for buddy-disappeared signal", user_data) self._handle_error("Timeout waiting for buddy-disappeared signal")
return False return False
def _testBuddyDisappeared_helper_cb(self, ps, buddy, user_data): def _testBuddyDisappeared_helper_cb(self, ps, buddy):
user_data["buddy"] = buddy self._buddy = buddy
user_data["success"] = True self._handle_success()
gtk.main_quit()
def _testBuddyDisappeared_helper(self, user_data): def _testBuddyDisappeared_helper(self):
busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE, busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE,
mockps._PRESENCE_PATH) mockps._PRESENCE_PATH)
try: try:
testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE) testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
# Add a fake buddy # Add a fake buddy
try: try:
testps.AddBuddy(self._BA_PUBKEY, self._BA_NICK, self._BA_COLOR) testps.AddBuddy(self._BA_PUBKEY, self._BA_NICK, self._BA_COLOR)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
ps = get_ps() ps = get_ps()
sid = ps.connect('buddy-disappeared', self._testBuddyDisappeared_helper_cb, user_data) sid = ps.connect('buddy-disappeared', self._testBuddyDisappeared_helper_cb)
user_data["sources"].append(sid) self._signals.append((ps, sid))
# Wait 5 seconds max for signal to be emitted # Wait 5 seconds max for signal to be emitted
sid = gobject.timeout_add(5000, self._testBuddyDisappeared_helper_timeout, user_data) sid = gobject.timeout_add(5000, self._testBuddyDisappeared_helper_timeout)
user_data["sources"].append(sid) self._sources.append(sid)
# Delete the fake buddy # Delete the fake buddy
try: try:
testps.RemoveBuddy(self._BA_PUBKEY) testps.RemoveBuddy(self._BA_PUBKEY)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
return False return False
@ -222,18 +224,16 @@ class BuddyTests(GenericTestCase):
ps = get_ps() ps = get_ps()
assert ps, "Couldn't get presence service" assert ps, "Couldn't get presence service"
user_data = {"success": False, "err": "", "buddy": None, "sources": []} self._buddy = None
gobject.idle_add(self._testBuddyDisappeared_helper, user_data) gobject.idle_add(self._testBuddyDisappeared_helper)
gtk.main() gtk.main()
self.cleanup(user_data)
assert user_data["success"] == True, user_data["err"] assert self._success == True, "Test unsuccessful."
assert user_data["buddy"], "Buddy was not received" assert self._buddy, "Buddy was not received"
buddy = user_data["buddy"] assert self._buddy.props.key == self._BA_PUBKEY, "Public key doesn't match expected"
assert buddy.props.key == self._BA_PUBKEY, "Public key doesn't match expected" assert self._buddy.props.nick == self._BA_NICK, "Nickname doesn't match expected"
assert buddy.props.nick == self._BA_NICK, "Nickname doesn't match expected" assert self._buddy.props.color == self._BA_COLOR, "Color doesn't match expected"
assert buddy.props.color == self._BA_COLOR, "Color doesn't match expected"
def addToSuite(suite): def addToSuite(suite):
suite.addTest(BuddyTests("testOwner")) suite.addTest(BuddyTests("testOwner"))
@ -269,36 +269,35 @@ class ActivityTests(GenericTestCase):
_AA_COLOR = "#adfe20,#bf781a" _AA_COLOR = "#adfe20,#bf781a"
_AA_PROPS = {"foo": "asdfadf", "bar":"5323aggdas"} _AA_PROPS = {"foo": "asdfadf", "bar":"5323aggdas"}
def _testActivityAppeared_helper_timeout(self, user_data): def _testActivityAppeared_helper_timeout(self):
self._handle_error("Timeout waiting for activity-appeared signal", user_data) self._handle_error("Timeout waiting for activity-appeared signal")
return False return False
def _testActivityAppeared_helper_cb(self, ps, activity, user_data): def _testActivityAppeared_helper_cb(self, ps, activity):
user_data["activity"] = activity self._activity = activity
user_data["success"] = True self._handle_success()
gtk.main_quit()
def _testActivityAppeared_helper(self, user_data): def _testActivityAppeared_helper(self):
ps = get_ps() ps = get_ps()
sid = ps.connect('activity-appeared', self._testActivityAppeared_helper_cb, user_data) sid = ps.connect('activity-appeared', self._testActivityAppeared_helper_cb)
user_data["sources"].append(sid) self._signals.append((ps, sid))
# Wait 5 seconds max for signal to be emitted # Wait 5 seconds max for signal to be emitted
sid = gobject.timeout_add(5000, self._testActivityAppeared_helper_timeout, user_data) sid = gobject.timeout_add(5000, self._testActivityAppeared_helper_timeout)
user_data["sources"].append(sid) self._sources.append(sid)
busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE, busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE,
mockps._PRESENCE_PATH) mockps._PRESENCE_PATH)
try: try:
testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE) testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
try: try:
testps.AddActivity(self._AA_ID, self._AA_NAME, self._AA_COLOR, self._AA_TYPE, {}) testps.AddActivity(self._AA_ID, self._AA_NAME, self._AA_COLOR, self._AA_TYPE, {})
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
return False return False
@ -307,20 +306,18 @@ class ActivityTests(GenericTestCase):
ps = get_ps() ps = get_ps()
assert ps, "Couldn't get presence service" assert ps, "Couldn't get presence service"
user_data = {"success": False, "err": "", "activity": None, "sources": []} self._activity = None
gobject.idle_add(self._testActivityAppeared_helper, user_data) gobject.idle_add(self._testActivityAppeared_helper)
gtk.main() gtk.main()
self.cleanup(user_data)
assert user_data["success"] == True, user_data["err"] assert self._success == True, "Test unsuccessful"
assert user_data["activity"], "Activity was not received" assert self._activity, "Activity was not received"
act = user_data["activity"] assert self._activity.props.id == self._AA_ID, "ID doesn't match expected"
assert act.props.id == self._AA_ID, "ID doesn't match expected" assert self._activity.props.name == self._AA_NAME, "Name doesn't match expected"
assert act.props.name == self._AA_NAME, "Name doesn't match expected" assert self._activity.props.color == self._AA_COLOR, "Color doesn't match expected"
assert act.props.color == self._AA_COLOR, "Color doesn't match expected" assert self._activity.props.type == self._AA_TYPE, "Type doesn't match expected"
assert act.props.type == self._AA_TYPE, "Type doesn't match expected" assert self._activity.props.joined == False, "Joined doesn't match expected"
assert act.props.joined == False, "Joined doesn't match expected"
# Try to get activity by activity ID # Try to get activity by activity ID
act2 = ps.get_activity(self._AA_ID) act2 = ps.get_activity(self._AA_ID)
@ -330,44 +327,43 @@ class ActivityTests(GenericTestCase):
assert act2.props.type == self._AA_TYPE, "Type doesn't match expected" assert act2.props.type == self._AA_TYPE, "Type doesn't match expected"
assert act2.props.joined == False, "Joined doesn't match expected" assert act2.props.joined == False, "Joined doesn't match expected"
def _testActivityDisappeared_helper_timeout(self, user_data): def _testActivityDisappeared_helper_timeout(self):
self._handle_error("Timeout waiting for activity-disappeared signal", user_data) self._handle_error("Timeout waiting for activity-disappeared signal")
return False return False
def _testActivityDisappeared_helper_cb(self, ps, activity, user_data): def _testActivityDisappeared_helper_cb(self, ps, activity):
user_data["activity"] = activity self._activity = activity
user_data["success"] = True self._handle_success()
gtk.main_quit()
def _testActivityDisappeared_helper(self, user_data): def _testActivityDisappeared_helper(self):
busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE, busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE,
mockps._PRESENCE_PATH) mockps._PRESENCE_PATH)
try: try:
testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE) testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
# Add a fake activity # Add a fake activity
try: try:
testps.AddActivity(self._AA_ID, self._AA_NAME, self._AA_COLOR, self._AA_TYPE, {}) testps.AddActivity(self._AA_ID, self._AA_NAME, self._AA_COLOR, self._AA_TYPE, {})
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
ps = get_ps() ps = get_ps()
sid = ps.connect('activity-disappeared', self._testActivityDisappeared_helper_cb, user_data) sid = ps.connect('activity-disappeared', self._testActivityDisappeared_helper_cb)
user_data["sources"].append(sid) self._signals.append((ps, sid))
# Wait 5 seconds max for signal to be emitted # Wait 5 seconds max for signal to be emitted
sid = gobject.timeout_add(5000, self._testActivityDisappeared_helper_timeout, user_data) sid = gobject.timeout_add(5000, self._testActivityDisappeared_helper_timeout)
user_data["sources"].append(sid) self._sources.append(sid)
# Delete the fake activity # Delete the fake activity
try: try:
testps.RemoveActivity(self._AA_ID) testps.RemoveActivity(self._AA_ID)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
return False return False
@ -376,59 +372,56 @@ class ActivityTests(GenericTestCase):
ps = get_ps() ps = get_ps()
assert ps, "Couldn't get presence service" assert ps, "Couldn't get presence service"
user_data = {"success": False, "err": "", "activity": None, "sources": []} self._activity = None
gobject.idle_add(self._testActivityDisappeared_helper, user_data) gobject.idle_add(self._testActivityDisappeared_helper)
gtk.main() gtk.main()
self.cleanup(user_data)
assert user_data["success"] == True, user_data["err"] assert self._success == True, "Test unsuccessful"
assert user_data["activity"], "Activity was not received" assert self._activity, "Activity was not received"
act = user_data["activity"] assert self._activity.props.id == self._AA_ID, "ID doesn't match expected"
assert act.props.id == self._AA_ID, "ID doesn't match expected" assert self._activity.props.name == self._AA_NAME, "Name doesn't match expected"
assert act.props.name == self._AA_NAME, "Name doesn't match expected" assert self._activity.props.color == self._AA_COLOR, "Color doesn't match expected"
assert act.props.color == self._AA_COLOR, "Color doesn't match expected" assert self._activity.props.type == self._AA_TYPE, "Type doesn't match expected"
assert act.props.type == self._AA_TYPE, "Type doesn't match expected" assert self._activity.props.joined == False, "Joined doesn't match expected"
assert act.props.joined == False, "Joined doesn't match expected"
def _testActivityShare_helper_is_done(self, user_data): def _testActivityShare_helper_is_done(self):
if user_data["got-act-appeared"] and user_data["got-joined-activity"]: if self._got_act_appeared and self._got_joined_activity:
user_data["success"] = True self._handle_success()
gtk.main_quit()
def _testActivityShare_helper_timeout(self, user_data): def _testActivityShare_helper_timeout(self):
self._handle_error("Timeout waiting for activity share", user_data) self._handle_error("Timeout waiting for activity share")
return False return False
def _testActivityShare_helper_joined_activity_cb(self, buddy, activity, user_data): def _testActivityShare_helper_joined_activity_cb(self, buddy, activity):
user_data["joined-activity-buddy"] = buddy self._joined_activity_buddy = buddy
user_data["joined-activity-activity"] = activity self._joined_activity_activity = activity
user_data["got-joined-activity"] = True self._got_joined_activity = True
self._testActivityShare_helper_is_done(user_data) self._testActivityShare_helper_is_done()
def _testActivityShare_helper_cb(self, ps, activity, user_data): def _testActivityShare_helper_cb(self, ps, activity):
user_data["activity"] = activity self._activity = activity
user_data["got-act-appeared"] = True self._got_act_appeared = True
self._testActivityShare_helper_is_done(user_data) self._testActivityShare_helper_is_done()
def _testActivityShare_helper(self, user_data): def _testActivityShare_helper(self):
ps = get_ps() ps = get_ps()
mockact = MockSugarActivity(self._AA_ID, self._AA_NAME, self._AA_TYPE) mockact = MockSugarActivity(self._AA_ID, self._AA_NAME, self._AA_TYPE)
sid = ps.connect('activity-appeared', self._testActivityShare_helper_cb, user_data) sid = ps.connect('activity-appeared', self._testActivityShare_helper_cb)
user_data["sources"].append(sid) self._signals.append((ps, sid))
try: try:
# Hook up to the owner's joined-activity signal # Hook up to the owner's joined-activity signal
owner = ps.get_owner() owner = ps.get_owner()
sid = owner.connect("joined-activity", self._testActivityShare_helper_joined_activity_cb, user_data) sid = owner.connect("joined-activity", self._testActivityShare_helper_joined_activity_cb)
user_data["sources"].append(sid) self._signals.append((owner, sid))
except RuntimeError, err: except RuntimeError, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
# Wait 5 seconds max for signal to be emitted # Wait 5 seconds max for signal to be emitted
sid = gobject.timeout_add(5000, self._testActivityShare_helper_timeout, user_data) sid = gobject.timeout_add(5000, self._testActivityShare_helper_timeout)
user_data["sources"].append(sid) self._sources.append(sid)
ps.share_activity(mockact, self._AA_PROPS) ps.share_activity(mockact, self._AA_PROPS)
@ -438,31 +431,25 @@ class ActivityTests(GenericTestCase):
ps = get_ps() ps = get_ps()
assert ps, "Couldn't get presence service" assert ps, "Couldn't get presence service"
user_data = {"success": False, self._activity = None
"err": "", self._got_act_appeared = False
"sources": [], self._joined_activity_buddy = None
"activity": None, self._joined_activity_activity = None
"got-act-appeared": False, self._got_joined_activity = False
"joined-activity-buddy": None, gobject.idle_add(self._testActivityShare_helper)
"joined-activity-activity": None,
"got-joined-activity": False
}
gobject.idle_add(self._testActivityShare_helper, user_data)
gtk.main() gtk.main()
self.cleanup(user_data)
assert user_data["success"] == True, user_data["err"] assert self._success == True, "Test unsuccessful."
assert user_data["activity"], "Shared activity was not received" assert self._activity, "Shared activity was not received"
act = user_data["activity"] assert self._activity.props.id == self._AA_ID, "ID doesn't match expected"
assert act.props.id == self._AA_ID, "ID doesn't match expected" assert self._activity.props.name == self._AA_NAME, "Name doesn't match expected"
assert act.props.name == self._AA_NAME, "Name doesn't match expected"
# Shared activities from local machine take the owner's color # Shared activities from local machine take the owner's color
assert act.props.color == mockps._OWNER_COLOR, "Color doesn't match expected" assert self._activity.props.color == mockps._OWNER_COLOR, "Color doesn't match expected"
assert act.props.type == self._AA_TYPE, "Type doesn't match expected" assert self._activity.props.type == self._AA_TYPE, "Type doesn't match expected"
assert act.props.joined == False, "Joined doesn't match expected" assert self._activity.props.joined == False, "Joined doesn't match expected"
buddies = act.get_joined_buddies() buddies = self._activity.get_joined_buddies()
assert len(buddies) == 1, "No buddies in activity" assert len(buddies) == 1, "No buddies in activity"
owner = buddies[0] owner = buddies[0]
assert owner.props.key == mockps._OWNER_PUBKEY, "Buddy key doesn't match expected" assert owner.props.key == mockps._OWNER_PUBKEY, "Buddy key doesn't match expected"
@ -472,71 +459,69 @@ class ActivityTests(GenericTestCase):
real_owner = ps.get_owner() real_owner = ps.get_owner()
assert real_owner == owner, "Owner mismatch" assert real_owner == owner, "Owner mismatch"
assert user_data["joined-activity-activity"] == act, "Activity mismatch" assert self._joined_activity_activity == self._activity, "Activity mismatch"
assert user_data["joined-activity-buddy"] == owner, "Owner mismatch" assert self._joined_activity_buddy == owner, "Owner mismatch"
def _testActivityJoin_helper_is_done(self, user_data): def _testActivityJoin_helper_is_done(self):
if user_data["got-act-appeared"] and \ if self._got_act_appeared and self._got_joined_activity and \
user_data["got-joined-activity"] and \ self._got_buddy_joined:
user_data["got-buddy-joined"]: self._handle_success()
user_data["success"] = True
gtk.main_quit()
def _testActivityJoin_helper_timeout(self, user_data): def _testActivityJoin_helper_timeout(self):
self._handle_error("Timeout waiting for activity share", user_data) self._handle_error("Timeout waiting for activity share")
return False return False
def _testActivityJoin_helper_buddy_joined_cb(self, activity, buddy, user_data): def _testActivityJoin_helper_buddy_joined_cb(self, activity, buddy):
user_data["buddy-joined-buddy"] = buddy self._buddy_joined_buddy = buddy
user_data["buddy-joined-activity"] = activity self._buddy_joined_activity = activity
user_data["got-buddy-joined"] = True self._got_buddy_joined = True
self._testActivityJoin_helper_is_done(user_data) self._testActivityJoin_helper_is_done()
def _testActivityJoin_helper_joined_activity_cb(self, buddy, activity, user_data): def _testActivityJoin_helper_joined_activity_cb(self, buddy, activity):
user_data["joined-activity-buddy"] = buddy self._joined_activity_buddy = buddy
user_data["joined-activity-activity"] = activity self._joined_activity_activity = activity
user_data["got-joined-activity"] = True self._got_joined_activity = True
self._testActivityJoin_helper_is_done(user_data) self._testActivityJoin_helper_is_done()
def _testActivityJoin_helper_cb(self, ps, activity, user_data): def _testActivityJoin_helper_cb(self, ps, activity):
user_data["activity"] = activity self._activity = activity
user_data["got-act-appeared"] = True self._got_act_appeared = True
# Hook up to the join signals # Hook up to the join signals
sid = activity.connect("buddy-joined", self._testActivityJoin_helper_buddy_joined_cb, user_data) sid = activity.connect("buddy-joined", self._testActivityJoin_helper_buddy_joined_cb)
user_data["sources"].append(sid) self._signals.append((activity, sid))
ps = get_ps() ps = get_ps()
owner = ps.get_owner() owner = ps.get_owner()
sid = owner.connect("joined-activity", self._testActivityJoin_helper_joined_activity_cb, user_data) sid = owner.connect("joined-activity", self._testActivityJoin_helper_joined_activity_cb)
user_data["sources"].append(sid) self._signals.append((owner, sid))
# Join the activity # Join the activity
activity.join() activity.join()
def _testActivityJoin_helper(self, user_data): def _testActivityJoin_helper(self):
busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE, busobj = dbus.SessionBus().get_object(mockps._PRESENCE_SERVICE,
mockps._PRESENCE_PATH) mockps._PRESENCE_PATH)
try: try:
testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE) testps = dbus.Interface(busobj, mockps._PRESENCE_TEST_INTERFACE)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
ps = get_ps() ps = get_ps()
sid = ps.connect('activity-appeared', self._testActivityJoin_helper_cb, user_data) sid = ps.connect('activity-appeared', self._testActivityJoin_helper_cb)
user_data["sources"].append(sid) self._signals.append((ps, sid))
# Add a fake activity # Add a fake activity
try: try:
testps.AddActivity(self._AA_ID, self._AA_NAME, self._AA_COLOR, self._AA_TYPE, {}) testps.AddActivity(self._AA_ID, self._AA_NAME, self._AA_COLOR, self._AA_TYPE, {})
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
self._handle_error(err, user_data) self._handle_error(err)
return False return False
# Wait 5 seconds max for signal to be emitted # Wait 5 seconds max for signal to be emitted
sid = gobject.timeout_add(5000, self._testActivityJoin_helper_timeout, user_data) sid = gobject.timeout_add(5000, self._testActivityJoin_helper_timeout)
user_data["sources"].append(sid) self._sources.append(sid)
return False return False
@ -544,30 +529,24 @@ class ActivityTests(GenericTestCase):
ps = get_ps() ps = get_ps()
assert ps, "Couldn't get presence service" assert ps, "Couldn't get presence service"
user_data = {"success": False, self._activity = None
"err": "", self._got_act_appeared = False
"sources": [], self._joined_activity_buddy = None
"activity": None, self._joined_activity_activity = None
"got-act-appeared": False, self._got_joined_activity = False
"joined-activity-buddy": None, self._buddy_joined_buddy = None
"joined-activity-activity": None, self._buddy_joined_activity = None
"got-joined-activity": False, self._got_buddy_joined = False
"buddy-joined-buddy": None, gobject.idle_add(self._testActivityJoin_helper)
"buddy-joined-activity": None,
"got-buddy-joined": False
}
gobject.idle_add(self._testActivityJoin_helper, user_data)
gtk.main() gtk.main()
self.cleanup(user_data)
assert user_data["success"] == True, "Test unsuccessful" assert self._success == True, "Test unsuccessful"
assert user_data["activity"], "Shared activity was not received" assert self._activity, "Shared activity was not received"
act = user_data["activity"] assert self._activity.props.id == self._AA_ID, "ID doesn't match expected"
assert act.props.id == self._AA_ID, "ID doesn't match expected" assert self._activity.props.name == self._AA_NAME, "Name doesn't match expected"
assert act.props.name == self._AA_NAME, "Name doesn't match expected"
buddies = act.get_joined_buddies() buddies = self._activity.get_joined_buddies()
assert len(buddies) == 1, "No buddies in activity" assert len(buddies) == 1, "No buddies in activity"
owner = buddies[0] owner = buddies[0]
assert owner.props.key == mockps._OWNER_PUBKEY, "Buddy key doesn't match expected" assert owner.props.key == mockps._OWNER_PUBKEY, "Buddy key doesn't match expected"
@ -577,10 +556,10 @@ class ActivityTests(GenericTestCase):
real_owner = ps.get_owner() real_owner = ps.get_owner()
assert real_owner == owner, "Owner mismatch" assert real_owner == owner, "Owner mismatch"
assert user_data["joined-activity-activity"] == act, "Activity mismatch" assert self._joined_activity_activity == self._activity, "Activity mismatch"
assert user_data["joined-activity-buddy"] == owner, "Owner mismatch" assert self._joined_activity_buddy == owner, "Owner mismatch"
assert user_data["buddy-joined-activity"] == act, "Activity mismatch" assert self._buddy_joined_activity == self._activity, "Activity mismatch"
assert user_data["buddy-joined-buddy"] == owner, "Owner mismatch" assert self._buddy_joined_buddy == owner, "Owner mismatch"
def addToSuite(suite): def addToSuite(suite):
suite.addTest(ActivityTests("testActivityAppeared")) suite.addTest(ActivityTests("testActivityAppeared"))