Changeset c386390

Timestamp:

2021-03-29T13:01:22Z (4 years ago)

Author:

/ <>

Children:

b9b29f3

Parents:

cb80802

Message:

moar

Files:

• .github/workflows/ci.yml (modified) (1 diff)
• .tests/btlib.py (modified) (6 diffs)
• .tests/cleanup_bitlbee.sh (modified) (1 diff)
• .tests/jabber_connect.py (added)
• .tests/jabber_send_msg.py (added)
• .tests/talk_to_bitlbee.py (modified) (1 diff)

.github/workflows/ci.yml

@@ -38 +38 @@
         ./.tests/setup_bitlbee.sh
 
+        python3 ./.tests/jabber_connect.py
 
         ./.tests/cleanup_bitlbee.sh

.tests/btlib.py

@@ -4 +4 @@
 import select
 
+FUN = [
+"Did I ask you something?",
+"Oh yeah, that's right.",
+"Alright, alright. Now go back to work.",
+"Buuuuuuuuuuuuuuuurp... Excuse me!",
+"Yes?",
+"No?",
+]
+
 SEPARATOR = "="*60
-SMOLPARATOR = "-"*60
 
 class IrcClient:
@@ -38 +46 @@
 
         if not connected:
-            print("IRC connection failed for " + self.nick)
-            sys.exit(1)
-        
-        print("IRC connection established for " + self.nick)
+            return False
 
         self.send_raw('USER ' + (self.nick + " ")*3)
         self.send_raw('NICK ' + self.nick)
         self.send_raw('JOIN &bitlbee')
+        return True
 
     def jabber_login(self):
@@ -53 +59 @@
         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)
+        return (self.log.find('Logged in') != -1):
 
     def receive(self):
@@ -91 +93 @@
     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)
@@ -108 +107 @@
     print(SEPARATOR)
     
-
     if fail:
         sys.exit(1)
 
+def connect_test(clis):
+    ret = True
+    for cli in clis:
+        ret = ret & cli.connect()
+    return ret
 
 def yes_test(clis):
@@ -125 +128 @@
     return ret
 
+def jabber_login_test(clis):
+    ret = True
+    for cli in clis:
+        ret = ret & cli.jabber_login()
+    return ret
+
 def add_buddy_test(clis):
     clis[0].add_jabber_buddy(clis[1].nick)

.tests/cleanup_bitlbee.sh

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

.tests/talk_to_bitlbee.py

@@ -1 +1 @@
 import btlib
 
-FUN = [
-"Did I ask you something?",
-"Oh yeah, that's right.",
-"Alright, alright. Now go back to work.",
-"Buuuuuuuuuuuuuuuurp... Excuse me!",
-"Yes?",
-"No?",
-]
-
-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 talk_to_bitlbee(clis):
+    ret = True
+    ret = ret & btlib.connect_test(clis)
+    ret = ret & btlib.yes_test(clis)
     return ret
 
-btlib.perform_test(yes_test)
+btlib.perform_test(btlib.talk_to_bitlbee)