Test attributes instead of methods

Author: bhrutledge

tests/test_auth.py

@@ -171,16 +171,17 @@ def _raise_home_key_error():
         raise KeyError("uid not found: 999")
 
 
-def test_get_username_keyring_missing_home_logged(monkeypatch, config, caplog):
+def test_get_username_keyring_key_error_logged(
+    entered_username, monkeypatch, config, caplog
+):
     class FailKeyring:
         @staticmethod
         def get_credential(system, username):
             _raise_home_key_error()
 
     monkeypatch.setattr(auth, "keyring", FailKeyring())
 
-    resolver = auth.Resolver(config, auth.CredentialInput())
-    assert not resolver.get_username_from_keyring()
+    assert auth.Resolver(config, auth.CredentialInput()).username == "entered user"
 
     assert re.search(
         r"Error from keyring"
@@ -192,17 +193,17 @@ def get_credential(system, username):
     )
 
 
-def test_get_password_keyring_missing_home_logged(monkeypatch, config, caplog):
+def test_get_password_keyring_key_error_logged(
+    entered_username, entered_password, monkeypatch, config, caplog
+):
     class FailKeyring:
         @staticmethod
         def get_password(system, username):
             _raise_home_key_error()
 
     monkeypatch.setattr(auth, "keyring", FailKeyring())
 
-    resolver = auth.Resolver(config, auth.CredentialInput("user"))
-    assert resolver.username == "user"
-    assert not resolver.get_password_from_keyring()
+    assert auth.Resolver(config, auth.CredentialInput()).password == "entered pw"
 
     assert re.search(
         r"Error from keyring"