Changeset 2806b5e

Timestamp:

2021-03-29T11:32:17Z (4 years ago)

Author:

/ <>

Children:

6066443

Parents:

7b1fd83

Message:

rf3

Files:

• .github/workflows/ci.yml (modified) (2 diffs)
• .tests/btlib.py (moved) (moved from .tests/test1.py) (5 diffs)
• .tests/talk_to_bitlbee.py (added)

.github/workflows/ci.yml

@@ -19 +19 @@
     - name: build bitlbee
       run: |
-        ./configure \
-            --asan=1
-           # --events=glib \
-           # --ssl=gnutls \
-           # --doc=0 \
-           # --jabber=0 \
-           # --msn=0 \
-           # --oscar=0 \
-           # --twitter=0 \
-           # --yahoo=0
-
+        ./configure --asan=1
         cat ./.tests/gcovflags >> Makefile.settings
         make
@@ -35 +25 @@
         touch ./debuglog
     
-    - name: jabber test
+    - name: talk to bitlbee
       run: |
+        ./.tests/setup_bitlbee.sh
+
+        python3 ./.tests/talk_to_bitlbee.py
+
+        ./.tests/cleanup_bitlbee.sh
+
+    - name: jabber: connect
         ./.tests/setup_prosody.sh
         ./.tests/setup_bitlbee.sh

.tests/btlib.py

@@ -3 +3 @@
 import time
 import select
-
-SHOWLOG = False
-SHOWTESTLOG = True
-
-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
@@ -96 +84 @@
     return received
 
-def debug_check(debug_file):
-    error_found = False
-    debug_log = ''
-    while True:
-        line = debug_file.readline()
-        if len(line) == 0:
-            break
-        debug_log += line
-        error_found = error_found or (line.lower().find('error') != -1)
-    return error_found, debug_log
-
-def perform_test(failed, clis, test_function, test_name, debug_file):
-    for cli in clis:
-        cli.tmplog=""
-
-    print("\n"+SEPARATOR)
-    print("Test: "+test_name)
+
+def perform_test(clis, test_function):
+    clis = []
+    clis += [btlib.IrcClient('test1', 'asd')]
+    clis += [btlib.IrcClient('test2', 'asd')]
+    for cli in clis:
+        cli.connect()
 
     fail = not test_function(clis)
 
-    debug_error, debug_log = debug_check(debug_file)
-
-    fail = fail or debug_error
+    for cli in clis:
+        cli.receive()
+        print(SEPARATOR)
+        print("Test Log "+ cli.nick+":")
+        print(cli.tmplog)
+    print(SEPARATOR)
+    
 
     if fail:
-        print("Test failed")
-        failed += [test_name]
-    else:
-        print("Test passed")
-
-    for cli in clis:
-        cli.receive()
-
-    if fail or SHOWTESTLOG:
-        for cli in clis:
-            if cli.tmplog != "":
-                print(SMOLPARATOR)
-                print("Test Log "+ cli.nick+":")
-                print(cli.tmplog)
-
-    if debug_error:
-        print(SMOLPARATOR)
-        print("Debug Log:")
-        print(debug_log)
-
-    print(SEPARATOR)
+        sys.exit(1)
+
 
 def yes_test(clis):
@@ -270 +233 @@
     return ret
     
-
 def run_tests(failed):
-    debug_file = open('./debuglog','r')
     clis = []
     clis += [IrcClient('test1', 'asd')]
@@ -285 +246 @@
         cli.jabber_login()
 
-    perform_test(failed, clis, add_buddy_test, "Add/remove buddy", debug_file)
-    perform_test(failed, clis, message_test, "Send message", debug_file)
+    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", debug_file)
-    perform_test(failed, clis, status_test, "Change status", debug_file)
-    perform_test(failed, clis, offline_test, "Go offline", debug_file)
-    perform_test(failed, clis, default_target_test, "Change default target", debug_file)
-    perform_test(failed, clis, help_test, "Ask for help", 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:
@@ -309 +270 @@
         print("\n" + SEPARATOR + "\nAll tests have passed")
     
-    debug_file.close()
-    
 if __name__ == "__main__":
     failed = []