Skip tests if there no required credentials available

Author: TheCommCraft

tests/test_activity.py

@@ -1,5 +1,6 @@
 import sys
 from datetime import datetime, timedelta, timezone
+import warnings
 
 
 
@@ -8,6 +9,9 @@ def test_activity():
     import scratchattach as sa
     from scratchattach.utils import exceptions
     import util
+    if not util.credentials_available():
+        warnings.warn("Skipped test_activity because there were no credentials available.")
+        return
     sess = util.session()
 
     # we cannot do assertions, but we can probe for any errors.

tests/test_auth.py

@@ -1,10 +1,13 @@
 import sys
 import os
+import warnings
 
-
-def test_import():
+def test_auth():
     sys.path.insert(0, ".")
     import util
+    if not util.credentials_available():
+        warnings.warn("Skipped test_auth because there were no credentials available.")
+        return
     sess = util.session()
 
     assert "FERNET_KEY" in os.environ

tests/test_comment.py

@@ -1,11 +1,14 @@
 import sys
 from datetime import datetime, timedelta, timezone
-
+import warnings
 
 def test_comment():
     sys.path.insert(0, ".")
     import scratchattach as sa
     import util
+    if not util.credentials_available():
+        warnings.warn("Skipped test_comment because there were no credentials available.")
+        return
     sess = util.session()
 
     user = sess.connect_linked_user()

tests/test_editor_integration.py

@@ -1,12 +1,15 @@
 import pprint
 import sys
-
+import warnings
 
 def test_project():
     sys.path.insert(0, ".")
     import scratchattach as sa
-    from util import session
-    sess = session()
+    import util
+    if not util.credentials_available():
+        warnings.warn("Skipped test_project because there were no credentials available.")
+        return
+    sess = util.session()
 
 
     project = sess.connect_project(104)

tests/test_project.py

@@ -1,11 +1,14 @@
 import pprint
 import sys
-
+import warnings
 
 def test_project():
     sys.path.insert(0, ".")
     import scratchattach as sa
-    from util import session
+    from util import session, credentials_available
+    if not credentials_available():
+        warnings.warn("Skipped test_project because there were no credentials available.")
+        return
     sess = session()
 
 

tests/test_search.py

@@ -1,10 +1,13 @@
 import sys
-
+import warnings
 
 def test_search():
     sys.path.insert(0, ".")
     import scratchattach as sa
-    from util import session
+    from util import session, credentials_available
+    if not credentials_available():
+        warnings.warn("Skipped test_search because there were no credentials available.")
+        return
     sess = session()
 
     print(sess.search_projects())

tests/test_studio.py

@@ -1,10 +1,14 @@
 import sys
 from datetime import datetime, timezone
+import warnings
 
-def test_import():
+def test_studio():
     sys.path.insert(0, ".")
     import scratchattach as sa
-    from util import session
+    from util import session, credentials_available
+    if not credentials_available():
+        warnings.warn("Skipped test_studio because there were no credentials available.")
+        return
     sess = session()
 
     studio = sess.connect_studio(50809872)

tests/test_user.py

@@ -1,11 +1,14 @@
 import pprint
 import sys
-
+import warnings
 
 def test_user():
     sys.path.insert(0, ".")
     import scratchattach as sa
-    from util import session
+    from util import session, credentials_available
+    if not credentials_available():
+        warnings.warn("Skipped test_studio because there were no credentials available.")
+        return
     sess = session()
 
     user = sess.connect_user("faretek1")

tests/util/__init__.py

@@ -4,19 +4,28 @@
 
 from typing import Optional
 
-from .keyhandler import AUTH as __AUTH
+from .keyhandler import get_auth
 from scratchattach import login, Session as _Session, LoginDataWarning
 
 warnings.filterwarnings('ignore', category=LoginDataWarning)
 
 _session: Optional[_Session] = None
 
+def credentials_available() -> bool:
+    auth = get_auth()
+    if not auth:
+        return False
+    return auth.get("auth") is not None
 
 def session() -> _Session:
     global _session
 
     if not _session:
-        _session = login("ScratchAttachV2", __AUTH["auth"]["scratchattachv2"])
+        auth = get_auth().get("auth")
+        scratchattachv2 = None if auth is None else auth.get("scratchattachv2")
+        if scratchattachv2 is None:
+            raise RuntimeError("Not enough data for login.")
+        _session = login("ScratchAttachV2", scratchattachv2)
 
     return _session
 
@@ -25,11 +34,11 @@ def teacher_session() -> Optional[_Session]:
     global _teacher_session
 
     if not _teacher_session:
-        if "teacher_auth" not in __AUTH:
+        if "teacher_auth" not in get_auth():
             warnings.warn(f"Could not test for teacher session")
             return None
 
-        data = __AUTH["teacher_auth"]
+        data = get_auth()["teacher_auth"]
         _teacher_session = login(data["username"], data["password"])
 
     return _teacher_session

tests/util/keyhandler.py

@@ -2,7 +2,7 @@
 import os
 import tomllib
 from pathlib import Path
-from typing import TypeVar
+from typing import Any, Optional, TypeVar
 
 from cryptography.fernet import Fernet
 from base64 import urlsafe_b64encode
@@ -59,8 +59,16 @@ def _decrypt_dict(data: dict) -> dict:
 _auth_fp = __fp__ / "auth.toml"
 _local_auth_fp = __fp__ / "local_auth.toml"
 
-_auth = _decrypt_dict(tomllib.load(_auth_fp.open("rb")))
+_cached_auth: Optional[dict[str, Any]] = None
 
-_local_auth = tomllib.load(_local_auth_fp.open("rb")) if _local_auth_fp.exists() else {}
+def get_auth() -> dict[str, Any]:
+    try:
+        _auth = _decrypt_dict(tomllib.load(_auth_fp.open("rb")))
+    except Exception:
+        _auth = {}
 
-AUTH = _auth | _local_auth
+    _local_auth = tomllib.load(_local_auth_fp.open("rb")) if _local_auth_fp.exists() else {}
+
+    _cached_auth = _auth | _local_auth
+    
+    return _cached_auth