Changeset e14bdc67

Timestamp:

2021-03-29T13:14:39Z (3 years ago)

Author:

/ <>

Children:

ef70f9f

Parents:

f7cd819

Message:

some more

Files:

• .github/workflows/ci.yml (modified) (1 diff)
• .tests/cleanup_bitlbee.sh (modified) (1 diff)
• .tests/jabber_add_buddy.py (added)
• .tests/jabber_rename_buddy.py (added)
• .tests/jabber_send_msg.py (modified) (1 diff)
• .tests/jabber_status.py (added)

.github/workflows/ci.yml

@@ -43 +43 @@
         ./.tests/cleanup_prosody.sh
 
+    - name: jabber add buddy
+      run: |
+        ./.tests/setup_prosody.sh
+        ./.tests/setup_bitlbee.sh
+
+        python3 ./.tests/jabber_add_buddy.py
+
+        ./.tests/cleanup_bitlbee.sh
+        ./.tests/cleanup_prosody.sh
+
+    - name: jabber send message
+      run: |
+        ./.tests/setup_prosody.sh
+        ./.tests/setup_bitlbee.sh
+
+        python3 ./.tests/jabber_send_msg.py
+
+        ./.tests/cleanup_bitlbee.sh
+        ./.tests/cleanup_prosody.sh
+
+    - name: jabber rename buddy
+      run: |
+        ./.tests/setup_prosody.sh
+        ./.tests/setup_bitlbee.sh
+
+        python3 ./.tests/jabber_rename_buddy.py
+
+        ./.tests/cleanup_bitlbee.sh
+        ./.tests/cleanup_prosody.sh
+
+    - name: jabber set status
+      run: |
+        ./.tests/setup_prosody.sh
+        ./.tests/setup_bitlbee.sh
+
+        python3 ./.tests/jabber_status.py
+
+        ./.tests/cleanup_bitlbee.sh
+        ./.tests/cleanup_prosody.sh
+
     - name: code coverage
       if: ${{ always() }}

.tests/cleanup_bitlbee.sh

@@ -5 +5 @@
 killall bitlbee
 
-printf '\n\nBitlbee output:\n\n'
+printf 'Bitlbee output:\n\n'
 less ./debuglog
 

.tests/jabber_send_msg.py

@@ -1 @@
-import socket
-import sys
-import time
-import select
+import btlib
 
-SEPARATOR = "="*60
-SMOLPARATOR = "-"*60
-
-class IrcClient:
-    def __init__(self, nick, pwd):
-        self.nick = nick
-        self.pwd = pwd
-        self.log = ''
-        self.tmplog = ''
-        self.sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-
-    def send_raw(self, msg, loud = False, log = True):
-        self.receive()
-        if loud:
-            print('FROM '+ self.nick + '|| ' + msg)
-        if log:
-            self.log += msg+'\r\n'
-            self.tmplog += msg+'\r\n'
-        self.sck.send((msg+'\r\n').encode())
-
-    def send_priv_msg(self, recip, msg, loud = False):
-        self.send_raw('PRIVMSG '+recip+' :'+msg, loud)
-
-    def connect(self):
-        connected = False
-        for x in range(5):
-            try:
-                self.sck.connect(('127.0.0.1', 6667))
-                connected = True
-                break
-            except:
-                time.sleep(1)
-
-        if not connected:
-            print("IRC connection failed for " + self.nick)
-            sys.exit(1)
-        
-        print("IRC connection established for " + self.nick)
-
-        self.send_raw('USER ' + (self.nick + " ")*3)
-        self.send_raw('NICK ' + self.nick)
-        self.send_raw('JOIN &bitlbee')
-
-    def jabber_login(self):
-        self.send_priv_msg("&bitlbee", "account add jabber "+self.nick+"@localhost "+self.pwd)
-        time.sleep(0.3)
-        self.send_priv_msg("&bitlbee", "account on")
-        time.sleep(1)
-        self.receive()
-        if self.log.find('Logged in') == -1:
-            print("Jabber login failed for " + self.nick)
-            sys.exit(1)
-        else:
-            print("Jabber login successful for " + self.nick)
-
-    def receive(self):
-        text = ''
-        while True:
-            readable, _, _ = select.select([self.sck], [], [], 5)
-            if self.sck in readable:
-                text += self.sck.recv(2040).decode()
-                for line in text.split('\n'):
-                    if line.find('PING') != -1:
-                        self.send_raw('PONG ' + line.split()[1])
-            else:
-                break
-        self.log += text
-        self.tmplog += text
-        return text
-
-    def add_jabber_buddy(self, nick):
-        self.send_priv_msg("&bitlbee", "add 0 " + nick+"@localhost")
-    
-    def block_jabber_buddy(self, nick):
-        self.send_priv_msg("&bitlbee", "block " + nick)
-
-    def unblock_jabber_buddy(self, nick):
-        self.send_priv_msg("&bitlbee", "allow " + nick)
-
-    def rename_jabber_buddy(self, oldnick, newnick):
-        self.send_priv_msg("&bitlbee", "rename " + oldnick + " " + newnick)
-        
-def msg_comes_thru(sender, receiver, message):
-    sender.send_priv_msg(receiver.nick, message)
-    received = receiver.receive().find(message) != -1
-    return received
-
-
-def perform_test(test_function):
-    clis = []
-    clis += [IrcClient('test1', 'asd')]
-    clis += [IrcClient('test2', 'asd')]
-    for cli in clis:
-        cli.connect()
-
-    fail = not test_function(clis)
-
-    for cli in clis:
-        cli.receive()
-        print(SEPARATOR)
-        print("Test Log "+ cli.nick+":")
-        print(cli.tmplog)
-    print(SEPARATOR)
-    
-
-    if fail:
-        sys.exit(1)
-
-
-def yes_test(clis):
-    ret = False
-    clis[0].send_priv_msg("&bitlbee", "yes")
-    clis[0].receive()
-    for x, fun in enumerate(FUN):
-        if (clis[0].log.find(fun) != -1):
-            ret = True
-            if x:
-                print("The RNG gods smile upon us")
-            break
+def send_msg(clis):
+    ret = True
+    ret = ret & btlib.connect_test(clis)
+    ret = ret & btlib.jabber_login_test(clis)
+    ret = ret & btlib.add_buddy_test(clis)
+    ret = ret & btlib.message_test(clis)
     return ret
 
-def add_buddy_test(clis):
-    clis[0].add_jabber_buddy(clis[1].nick)
-    clis[1].send_priv_msg("&bitlbee", "yes")
-
-    clis[1].add_jabber_buddy(clis[0].nick)
-    clis[0].send_priv_msg("&bitlbee", "yes")
-
-    clis[0].send_priv_msg("&bitlbee", "blist")
-    junk = clis[0].receive()
-    ret = junk.find(clis[1].nick) != -1
-    ret = ret & (junk.find("1 available") != -1)
-    '''
-    clis[0].send_priv_msg("&bitlbee", "remove " +clis[1].nick)
-    clis[0].send_priv_msg("&bitlbee", "blist")
-    ret = ret & (clis[0].receive().find(clis[1].nick) == -1)
-
-    clis[0].add_jabber_buddy(clis[1].nick)
-    clis[1].send_priv_msg("&bitlbee", "yes")
-    time.sleep(1)
-    clis[0].send_priv_msg("&bitlbee", "blist")
-    junk = clis[0].receive()
-    ret = ret & (junk.find("1 available") != -1)
-    ret = ret & (junk.find(clis[1].nick) != -1)
-    '''
-    return ret
-
-def message_test(clis):
-    ret = msg_comes_thru(clis[0], clis[1], 'ohai <3')
-    ret = ret & msg_comes_thru(clis[1], clis[0], 'uwu *pounces*')
-    return ret
-
-def block_test(clis):
-    clis[0].block_jabber_buddy(clis[1].nick)
-    ret = not msg_comes_thru(clis[1], clis[0], 'm-meow?')
-    clis[0].unblock_jabber_buddy(clis[1].nick)
-    ret = ret & msg_comes_thru(clis[1], clis[0], '*purrs*')
-    return ret
-
-def rename_test(clis):
-    newname = "xXx_pup_LINKENPARK4EVA"
-    message = "rawr meanmz i luv<3 u in dinosaur"
-
-    clis[0].rename_jabber_buddy(clis[1].nick, newname)
-    clis[0].send_priv_msg(newname, message)
-    ret = clis[1].receive().find(message) != -1
-
-    clis[0].rename_jabber_buddy("-del", newname)
-    ret = ret & msg_comes_thru(clis[0], clis[1], "rawr")
-    return ret
-
-def status_test(clis):
-    status = "get out of my room mom"
-    clis[1].send_priv_msg("&bitlbee", "set status '"+status+"'")
-    clis[0].send_priv_msg("&bitlbee", "info "+clis[1].nick)
-    ret = (clis[0].receive().find("jabber - Status message: "+status) != -1)
-
-    clis[1].send_priv_msg("&bitlbee", "set")
-    ret = ret & (clis[1].receive().find(status) != -1)
-
-    clis[1].send_priv_msg("&bitlbee", "set -del status")
-    clis[0].send_priv_msg("&bitlbee", "info "+clis[1].nick)
-    ret = ret & (clis[0].receive().find("jabber - Status message: (none)") != -1)
-    return ret
-
-def offline_test(clis):
-    clis[0].send_priv_msg("&bitlbee", "account off")
-
-    junk = clis[0].receive()
-    ret = (junk.find(clis[1].nick) != -1)
-    ret = ret & (junk.find("QUIT") != -1)
-
-    junk = clis[1].receive()
-    ret = ret & (junk.find(clis[0].nick) != -1)
-    ret = ret & (junk.find("QUIT") != -1)
-
-    clis[0].send_priv_msg(clis[1].nick, "i'm not ur mom")
-    ret = ret & (clis[0].receive().find("No such nick/channel") != -1)
-
-    clis[0].send_priv_msg("&bitlbee", "account on")
-
-    junk = clis[0].receive()
-    ret = ret & (junk.find(clis[1].nick) != -1)
-    ret = ret & (junk.find("JOIN") != -1)
-
-    junk = clis[1].receive()
-    ret = ret & (junk.find(clis[0].nick) != -1)
-    ret = ret & (junk.find("JOIN") != -1)
-
-    return ret
-
-def default_target_test(clis):
-    clis[0].send_priv_msg("&bitlbee", "set default_target last")
-    clis[0].send_priv_msg("&bitlbee", "test2: ur mah default now")
-    
-    ret = (clis[1].receive().find("ur mah default now") != -1)
-
-    clis[0].send_priv_msg("&bitlbee", "mrow")
-    ret = ret & (clis[1].receive().find("mrow") != -1)
-
-    clis[0].send_priv_msg("root", "set default_target root")
-    junk = clis[0].receive()
-    ret = ret & (junk.find("default_target") != -1)
-    ret = ret & (junk.find("root") != -1)
-
-    clis[0].send_priv_msg("&bitlbee", "yes")
-    ret = ret & (clis[1].receive().find("yes") == -1)
-    return ret 
-
-def help_test(clis):
-    clis[0].send_priv_msg("&bitlbee", "help")
-    ret = (clis[0].receive().find("identify_methods") != -1)
-    clis[0].send_priv_msg("&bitlbee", "help commands")
-    ret = ret & (clis[0].receive().find("qlist") != -1)
-    return ret
-    
-def run_tests(failed):
-    clis = []
-    clis += [IrcClient('test1', 'asd')]
-    clis += [IrcClient('test2', 'asd')]
-    for cli in clis:
-        cli.connect()
-
-    perform_test(failed, clis, yes_test, "Yes", debug_file)
-
-    print("")
-    for cli in clis:
-        cli.jabber_login()
-
-    perform_test(failed, clis, add_buddy_test, "Add/remove buddy")
-    perform_test(failed, clis, message_test, "Send message")
-    #perform_test(failed, clis, block_test, "Block user", debug_file)
-    perform_test(failed, clis, rename_test, "Rename user")
-    perform_test(failed, clis, status_test, "Change status")
-    perform_test(failed, clis, offline_test, "Go offline")
-    perform_test(failed, clis, default_target_test, "Change default target")
-    perform_test(failed, clis, help_test, "Ask for help")
-
-    if failed or SHOWLOG:
-        print("")
-        for cli in clis:
-            print(SMOLPARATOR)
-            print("Log "+ cli.nick+":")
-            print(cli.log)
-        print(SMOLPARATOR)
-
-    if failed:
-        print("\n" + SEPARATOR + "\nSome test have failed:")
-        for fail in failed:
-            print(fail)
-    else:
-        print("\n" + SEPARATOR + "\nAll tests have passed")
-    
-if __name__ == "__main__":
-    failed = []
-    run_tests(failed)
-    if failed:
-        sys.exit(1)
+btlib.perform_test(send_msg)