From 749b385ac387b776b68dd3fe1c29c454ee14155d Mon Sep 17 00:00:00 2001
From: Kushal Das <kushal@freedom.press>
Date: Fri, 3 Aug 2018 13:45:51 +0530
Subject: [PATCH] Updates test user creation logic inside of container

Removing old method calls from user creation logic, this is only
used inside of the container for the functional testing.
---
 securedrop/tests/functional/functional_test.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/securedrop/tests/functional/functional_test.py b/securedrop/tests/functional/functional_test.py
index 0320e6cef1..45928c31ef 100644
--- a/securedrop/tests/functional/functional_test.py
+++ b/securedrop/tests/functional/functional_test.py
@@ -255,9 +255,6 @@ def setup(self, session_expiration=30):
                                   password=valid_password,
                                   is_admin=True)
                 user.otp_secret = 'JHCOGO7VCER3EJ4L'
-                user.pw_salt = user._gen_salt()
-                user.pw_hash = user._scrypt_hash('WEjwn8ZyczDhQSK24YKM8C9a',
-                                                 user.pw_salt)
                 db.session.add(user)
                 db.session.commit()
             except IntegrityError:
@@ -279,7 +276,7 @@ def setup(self, session_expiration=30):
             # This user is required for our tests cases to login
             self.admin_user = {
                                 "name": "journalist",
-                                "password": "WEjwn8ZyczDhQSK24YKM8C9a",
+                                "password": "correct horse battery staple profanity oil chewy",
                                 "secret": "JHCOGO7VCER3EJ4L"}
             self.admin_user['totp'] = pyotp.TOTP(self.admin_user['secret'])
             self.sleep_time = 2