From 9a22713080178d86f9de9810c2a8bfa957598cac Mon Sep 17 00:00:00 2001
From: shockrah <alejandros714@protonmail.com>
Date: Thu, 6 May 2021 17:12:49 -0700
Subject: [PATCH] + Testing /invite/join + Testing /meta + Testing
 /neighbors/list

---
 json-api/client-tests/config.py | 6 ++++--
 json-api/client-tests/main.py   | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/json-api/client-tests/config.py b/json-api/client-tests/config.py
index 118556c..28cc25f 100644
--- a/json-api/client-tests/config.py
+++ b/json-api/client-tests/config.py
@@ -1,5 +1,6 @@
 import subprocess
 import os
+import sys
 import json
 
 class Server:
@@ -42,11 +43,12 @@ def create_admin() -> Admin :
         raw = json.loads(proc.stdout)
         user = raw.get('user')
         server = raw.get('server')
-        print(f'Raw data to use as user: {raw}')
         if user is None or server is None:
+            print(f'User/Server Data was not serializable => raw', file=sys.stderr)
             return None
         else:
             return Admin(user, server)
-    except:
+    except Exception as e:
+        print(f'General exception caught in parsing => {e}', file=sys.stderr)
         return None
 
diff --git a/json-api/client-tests/main.py b/json-api/client-tests/main.py
index 8002455..8b35026 100644
--- a/json-api/client-tests/main.py
+++ b/json-api/client-tests/main.py
@@ -7,7 +7,8 @@ RESPONSES = []
 VOICE_CHAN = 1
 TEXT_CHAN = 2
 
-def login() -> (Request, str):
+def login(admin: Admin) -> (Request, str):
+    print(f'Provided admin account {admin.server}')
     req = Request(
         admin.server.url + '/login', 
         'post', 
@@ -89,7 +90,7 @@ if __name__ == '__main__':
 
     # First a quick sanity check for login
     # add this after we fire the generic tests
-    login_req, jwt = login()
+    login_req, jwt = login(admin)
     if jwt is None:
         print('Unable to /login - stopping now to avoid pointless failure')
         req.show_response()
@@ -118,7 +119,9 @@ if __name__ == '__main__':
         req(admin, 'get', '/members/me', {}, 200),
         req(admin, 'get', '/members/get_online', {}, 200),
         req(admin, 'post', '/members/me/nickname', {'nick': f'randy-{time()}'}, 200),
-        req(admin , 'get', '/invite/join', {'code': 123}, 404)
+        req(admin , 'get', '/invite/join', {'code': 123}, 404),
+        req(admin , "get", "/meta", {}, 200),
+        req(admin, 'get', '/neighbors/list', {}, 200, verbose=True)
     ])
 
     # add this after fire the generic tests