Moved out the HASHED_PASSWORD in order to be global variable, and added an error message to the UnhashedPasswordError

Author: orronai

lms/models/users.py

@@ -8,15 +8,15 @@
 )
 
 
+HASHED_PASSWORD = re.compile(r'^pbkdf2.+?\$(?P<salt>.+?)\$(?P<password>.+)')
+
+
 def retrieve_salt(user: User) -> str:
-    HASHED_PASSWORD = re.compile(
-        r'^pbkdf2.+?\$(?P<salt>.+?)\$(?P<password>.+)',
-    )
     password = HASHED_PASSWORD.match(user.password)
     try:
         return password.groupdict().get('salt')
     except AttributeError:  # should never happen
-        raise UnhashedPasswordError
+        raise UnhashedPasswordError('Password format is invalid.')
 
 
 def auth(username: str, password: str) -> User:

tests/conftest.py

@@ -178,7 +178,7 @@ def admin_user():
     )
 
 
-@pytest.fixture(autouse=True, scope='session')
+@pytest.fixture(autouse=True, scope='function')
 def captured_templates():
     recorded = []
 

tests/samples/config.py.example

@@ -14,7 +14,6 @@ FEATURE_FLAG_CHECK_IDENTICAL_CODE_ON = os.getenv(
 )
 
 
-
 MAIL_WELCOME_MESSAGE = 'welcome-email'
 USERS_CSV = 'users.csv'
 ERRORS_CSV = 'errors.csv'