Changeset 50efbf4

Timestamp:

2021-03-31T10:37:18Z (4 years ago)

Author:

/ <>

Children:

1fb3406

Parents:

dde98bb2

Message:

remove bud

Files:

• .github/workflows/ci.yml (modified) (1 diff)
• .tests/btlib.py (modified) (4 diffs)
• .tests/cleanup_prosody.sh (modified) (1 diff)
• .tests/jabber_remove_buddy.py (added)
• .tests/setup_prosody.sh (modified) (1 diff)

.github/workflows/ci.yml

@@ -15 +15 @@
         sudo apt-get update -y
         sudo apt-get install -y --no-install-recommends clang git make pkg-config libgnutls28-dev libgcrypt20-dev libglib2.0-dev prosody gcovr
-        #sudo prosodyctl stop
+        sudo prosodyctl stop
 
     - name: build bitlbee

.tests/btlib.py

@@ -14 +14 @@
 
 SEPARATOR = "="*60
+
+ALWAYSSHOWLOG = False
 
 class IrcClient:
@@ -100 +102 @@
     fail = not test_function(clis)
 
-    for cli in clis:
-        cli.receive()
+    if ALWAYSSHOWLOG or fail:
+        for cli in clis:
+            cli.receive()
+            print(SEPARATOR)
+            print("Test Log "+ cli.nick+":")
+            print(cli.tmplog)
         print(SEPARATOR)
-        print("Test Log "+ cli.nick+":")
-        print(cli.tmplog)
-    print(SEPARATOR)
     
     if fail:
@@ -145 +148 @@
     ret = junk.find(clis[1].nick) != -1
     ret = ret & (junk.find("1 available") != -1)
-    '''
+    return ret
+
+def remove_buddy_test(clis):
+    ret = add_buddy_test(clis)
+
     clis[0].send_priv_msg("&bitlbee", "remove " +clis[1].nick)
-    clis[0].send_priv_msg("&bitlbee", "blist")
+    clis[0].send_priv_msg("&bitlbee", "blist all")
+    time.sleep(0.5)
     ret = ret & (clis[0].receive().find(clis[1].nick) == -1)
 
@@ -153 +161 @@
     clis[1].send_priv_msg("&bitlbee", "yes")
     time.sleep(1)
-    clis[0].send_priv_msg("&bitlbee", "blist")
+    clis[0].send_priv_msg("&bitlbee", "blist all")
+    time.sleep(0.5)
     junk = clis[0].receive()
     ret = ret & (junk.find("1 available") != -1)
     ret = ret & (junk.find(clis[1].nick) != -1)
-    '''
     return ret
 

.tests/cleanup_prosody.sh

@@ -5 +5 @@
 sudo prosodyctl deluser test1@localhost
 sudo prosodyctl deluser test2@localhost
-#sudo prosodyctl stop
+sudo prosodyctl stop

.tests/setup_prosody.sh

@@ -3 +3 @@
 set -e
 
-#sudo /etc/init.d/prosody start
+sudo /etc/init.d/prosody start
 sudo prosodyctl register test1 localhost asd
 sudo prosodyctl register test2 localhost asd