Changeset d28ca33

Timestamp:

2021-03-16T14:49:57Z (4 years ago)

Author:

/ <>

Children:

0167270

Parents:

1ba675c

Message:

less glob more verbose

File:

• .tests/test1.py (modified) (9 diffs)

.tests/test1.py

@@ -9 +9 @@
 OFFLINETEST = False
 RENAMETEST = True
-SHOWLOG = True
-
-FAILED = []
+SHOWLOG = False
+SHOWTESTLOG = True
 
 SEPARATOR = "="*60
@@ -32 +31 @@
         self.sck.send((msg+'\r\n').encode())
 
-    def send_priv_msg(self, recip, msg, loud = True):
+    def send_priv_msg(self, recip, msg, loud = False):
         self.send_raw('PRIVMSG '+recip+' :'+msg, loud)
 
@@ -92 +91 @@
     return received
 
-def perform_test(clis, test_function, test_name):
-    global FAILED
+def perform_test(failed, clis, test_function, test_name):
+    fail = False
     for cli in clis:
         cli.tmplog=""
@@ -104 +103 @@
     else:
         print("Test failed")
-        FAILED += [test_name]
+        failed += [test_name]
+        fail = True
 
+    if fail or SHOWTESTLOG:
         for cli in clis:
             if cli.tmplog != "":
@@ -127 +128 @@
 
 def message_test(clis):
-    print("Test: Send message")
     ret = msg_comes_thru(clis[0], clis[1], 'ohai <3')
     ret = ret & msg_comes_thru(clis[1], clis[0], 'uwu *pounces*')
@@ -151 +151 @@
     return ret
 
-def run_tests():
-    global FAILED
+def run_tests(failed):
     clis = []
     clis += [IrcClient('test1', 'asd')]
@@ -160 +159 @@
 
     if YESTEST:
-        perform_test(clis, yes_test, "Yes")
+        perform_test(failed, clis, yes_test, "Yes")
 
     for cli in clis:
         cli.jabber_login()
+
     clis[0].add_jabber_buddy(clis[1].nick)
 
     if MESSAGETEST:
-        perform_test(clis, message_test, "Send message")
+        perform_test(failed, clis, message_test, "Send message")
 
     if BLOCKTEST:
-        perform_test(clis, block_test, "Block user")
+        perform_test(failed, clis, block_test, "Block user")
 
     if RENAMETEST:
-        perform_test(clis, rename_test, "Rename user")
+        perform_test(failed, clis, rename_test, "Rename user")
 
-    if FAILED or SHOWLOG:
+    if failed or SHOWLOG:
         print("")
         for cli in clis:
@@ -183 +183 @@
         print(SMOLPARATOR)
 
-    if FAILED:
+    if failed:
         print("\n" + SEPARATOR + "\nSome test have failed:")
-        for fail in FAILED:
+        for fail in failed:
             print(fail)
     else:
@@ -191 +191 @@
     
 if __name__ == "__main__":
-    run_tests()
-    if FAILED:
+    failed = []
+    run_tests(failed)
+    if failed:
         sys.exit(1)