Changeset be98957

Timestamp:

2013-01-19T11:36:27Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b2dc873, e4f5ca8

Parents:

a9a6598 (diff), 69ae6f2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from vmiklos.

Location:

protocols/skype

Files:

• skype.c (modified) (1 diff)
• t/add-no-bitlbee.mock (added)
• t/add-no-skyped.mock (added)
• t/add-yes-bitlbee.mock (added)
• t/add-yes-skyped.mock (added)
• t/call-failed-bitlbee.mock (added)
• t/call-failed-skyped.mock (added)
• t/call-skyped.mock (modified) (2 diffs)
• t/called-no-bitlbee.mock (added)
• t/called-no-skyped.mock (added)
• t/called-yes-bitlbee.mock (added)
• t/called-yes-skyped.mock (added)
• t/groupchat-invite-bitlbee.mock (added)
• t/groupchat-invite-skyped.mock (added)
• t/groupchat-invited-bitlbee.mock (added)
• t/groupchat-invited-skyped.mock (added)
• t/info-skyped.mock (modified) (2 diffs)
• t/login-skyped.mock (modified) (2 diffs)
• t/msg-skyped.mock (modified) (2 diffs)
• test.py (modified) (2 diffs)

protocols/skype/skype.c

@@ -980 +980 @@
                         sd->adder = NULL;
                 }
-        } else if (!strncmp(info, "ACTIVEMEMBERS ", 14)) {
-                info += 14;
+        } else if (!strncmp(info, "MEMBERS ", 8)) {
+                info += 8;
                 gc = bee_chat_by_title(ic->bee, ic, id);
                 /* Hack! We set ->data to TRUE

protocols/skype/t/call-skyped.mock

@@ -2 +2 @@
 << GROUPS 48, 49
 >> SEARCH FRIENDS
-<< USERS echo123, bob, bitlbee-skype
+<< USERS echo123, bob
 >> SET USERSTATUS ONLINE
 << USERSTATUS ONLINE
@@ -11 +11 @@
 >> GET USER bob ONLINESTATUS
 << USER bob ONLINESTATUS ONLINE
->> GET USER bitlbee-skype ONLINESTATUS
-<< USER bitlbee-skype ONLINESTATUS OFFLINE
 >> CALL bob
 << CALL 178 STATUS UNPLACED

protocols/skype/t/info-skyped.mock

@@ -2 +2 @@
 << GROUPS 48, 49
 >> SEARCH FRIENDS
-<< USERS echo123, bob, bitlbee-skype
+<< USERS echo123, bob
 >> SET USERSTATUS ONLINE
 << USERSTATUS ONLINE
@@ -11 +11 @@
 >> GET USER bob ONLINESTATUS
 << USER bob ONLINESTATUS ONLINE
->> GET USER bitlbee-skype ONLINESTATUS
-<< USER bitlbee-skype ONLINESTATUS OFFLINE
 >> GET USER bob FULLNAME
 << USER bob FULLNAME Bob

protocols/skype/t/login-skyped.mock

@@ -2 +2 @@
 << GROUPS 48, 49
 >> SEARCH FRIENDS
-<< USERS echo123, bob, bitlbee-skype
+<< USERS echo123, bob
 >> SET USERSTATUS ONLINE
 << USERSTATUS ONLINE
@@ -11 +11 @@
 >> GET USER bob ONLINESTATUS
 << USER bob ONLINESTATUS ONLINE
->> GET USER bitlbee-skype ONLINESTATUS
-<< USER bitlbee-skype ONLINESTATUS OFFLINE

protocols/skype/t/msg-skyped.mock

@@ -2 +2 @@
 << GROUPS 48, 49
 >> SEARCH FRIENDS
-<< USERS echo123, bob, bitlbee-skype
+<< USERS echo123, bob
 >> SET USERSTATUS ONLINE
 << USERSTATUS ONLINE
@@ -11 +11 @@
 >> GET USER bob ONLINESTATUS
 << USER bob ONLINESTATUS ONLINE
->> GET USER bitlbee-skype ONLINESTATUS
-<< USER bitlbee-skype ONLINESTATUS OFFLINE
 >> MESSAGE bob foo
 << CHATMESSAGE 290 STATUS SENDING

protocols/skype/test.py

@@ -28 +28 @@
                                 line = i.strip()
                                 if line.startswith(">> "):
-                                        bitlbee.expect(line[3:], timeout=10)
+                                        bitlbee.expect_exact(line[3:], timeout=10)
                                 elif line.startswith("<< "):
                                         bitlbee.sendline(line[3:])
@@ -75 +75 @@
         def testCall(self):
                 self.mock("call")
+        
+        def testCallFailed(self):
+                self.mock("call-failed")
+        
+        def testAddYes(self):
+                self.mock("add-yes")
+
+        def testAddNo(self):
+                self.mock("add-no")
+
+        def testGroupchatInvited(self):
+                self.mock("groupchat-invited")
+
+        def testGroupchatInvite(self):
+                self.mock("groupchat-invite")
+        
+        def testCalledYes(self):
+                self.mock("called-yes")
+
+        def testCalledNo(self):
+                self.mock("called-no")
 
 if __name__ == '__main__':