Changeset be98957


Ignore:
Timestamp:
2013-01-19T11:36:27Z (8 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:
14 added
6 edited

Legend:

Unmodified
Added
Removed
  • protocols/skype/skype.c

    ra9a6598 rbe98957  
    980980                        sd->adder = NULL;
    981981                }
    982         } else if (!strncmp(info, "ACTIVEMEMBERS ", 14)) {
    983                 info += 14;
     982        } else if (!strncmp(info, "MEMBERS ", 8)) {
     983                info += 8;
    984984                gc = bee_chat_by_title(ic->bee, ic, id);
    985985                /* Hack! We set ->data to TRUE
  • protocols/skype/t/call-skyped.mock

    ra9a6598 rbe98957  
    22<< GROUPS 48, 49
    33>> SEARCH FRIENDS
    4 << USERS echo123, bob, bitlbee-skype
     4<< USERS echo123, bob
    55>> SET USERSTATUS ONLINE
    66<< USERSTATUS ONLINE
     
    1111>> GET USER bob ONLINESTATUS
    1212<< USER bob ONLINESTATUS ONLINE
    13 >> GET USER bitlbee-skype ONLINESTATUS
    14 << USER bitlbee-skype ONLINESTATUS OFFLINE
    1513>> CALL bob
    1614<< CALL 178 STATUS UNPLACED
  • protocols/skype/t/info-skyped.mock

    ra9a6598 rbe98957  
    22<< GROUPS 48, 49
    33>> SEARCH FRIENDS
    4 << USERS echo123, bob, bitlbee-skype
     4<< USERS echo123, bob
    55>> SET USERSTATUS ONLINE
    66<< USERSTATUS ONLINE
     
    1111>> GET USER bob ONLINESTATUS
    1212<< USER bob ONLINESTATUS ONLINE
    13 >> GET USER bitlbee-skype ONLINESTATUS
    14 << USER bitlbee-skype ONLINESTATUS OFFLINE
    1513>> GET USER bob FULLNAME
    1614<< USER bob FULLNAME Bob
  • protocols/skype/t/login-skyped.mock

    ra9a6598 rbe98957  
    22<< GROUPS 48, 49
    33>> SEARCH FRIENDS
    4 << USERS echo123, bob, bitlbee-skype
     4<< USERS echo123, bob
    55>> SET USERSTATUS ONLINE
    66<< USERSTATUS ONLINE
     
    1111>> GET USER bob ONLINESTATUS
    1212<< USER bob ONLINESTATUS ONLINE
    13 >> GET USER bitlbee-skype ONLINESTATUS
    14 << USER bitlbee-skype ONLINESTATUS OFFLINE
  • protocols/skype/t/msg-skyped.mock

    ra9a6598 rbe98957  
    22<< GROUPS 48, 49
    33>> SEARCH FRIENDS
    4 << USERS echo123, bob, bitlbee-skype
     4<< USERS echo123, bob
    55>> SET USERSTATUS ONLINE
    66<< USERSTATUS ONLINE
     
    1111>> GET USER bob ONLINESTATUS
    1212<< USER bob ONLINESTATUS ONLINE
    13 >> GET USER bitlbee-skype ONLINESTATUS
    14 << USER bitlbee-skype ONLINESTATUS OFFLINE
    1513>> MESSAGE bob foo
    1614<< CHATMESSAGE 290 STATUS SENDING
  • protocols/skype/test.py

    ra9a6598 rbe98957  
    2828                                line = i.strip()
    2929                                if line.startswith(">> "):
    30                                         bitlbee.expect(line[3:], timeout=10)
     30                                        bitlbee.expect_exact(line[3:], timeout=10)
    3131                                elif line.startswith("<< "):
    3232                                        bitlbee.sendline(line[3:])
     
    7575        def testCall(self):
    7676                self.mock("call")
     77       
     78        def testCallFailed(self):
     79                self.mock("call-failed")
     80       
     81        def testAddYes(self):
     82                self.mock("add-yes")
     83
     84        def testAddNo(self):
     85                self.mock("add-no")
     86
     87        def testGroupchatInvited(self):
     88                self.mock("groupchat-invited")
     89
     90        def testGroupchatInvite(self):
     91                self.mock("groupchat-invite")
     92       
     93        def testCalledYes(self):
     94                self.mock("called-yes")
     95
     96        def testCalledNo(self):
     97                self.mock("called-no")
    7798
    7899if __name__ == '__main__':
Note: See TracChangeset for help on using the changeset viewer.