repair expected pw hash

Author: albu-diku

tests/test_mig_server_createuser.py

@@ -32,7 +32,7 @@
 import shutil
 import sys
 
-from tests.support import MIG_BASE, TEST_OUTPUT_DIR, MigTestCase, testmain
+from tests.support import PY2, MIG_BASE, TEST_OUTPUT_DIR, MigTestCase, testmain
 from tests.support.picklesupp import PickleAssertMixin
 
 from mig.server.createuser import _main as createuser
@@ -82,7 +82,15 @@ def test_user_db_is_created_when_absent(self):
 
 
     def test_user_entry_is_recorded(self):
+        def _generate_salt():
+            return b'CCCC12344321CCCC'
+
         expected_user_id = '/C=DK/ST=NA/L=NA/O=Test Org/OU=NA/CN=Test User/emailAddress=user@example.com'
+        if PY2:
+            expected_user_password_hash = 'PBKDF2$sha256$10000$CCCC12344321CCCC$bph8p/avUq42IYeOdJoJuUqrJ7Q32eaT'
+        else:
+            expected_user_password_hash = "PBKDF2$sha256$10000$b'CCCC12344321CCCC'$b'bph8p/avUq42IYeOdJoJuUqrJ7Q32eaT'"
+
         args = [
             "Test User",
             "Test Org",
@@ -94,16 +102,12 @@ def test_user_entry_is_recorded(self):
         ]
         print("")  # acount for output generated by the logic
 
-        def _generate_salt():
-            return b'CCCC12344321CCCC'
         createuser(self.configuration, args, default_renew=True,
             _generate_salt=_generate_salt)
 
         pickled = self.assertPickledFile(self.expected_user_db_file)
-
         self.assertIn(expected_user_id, pickled)
         actual_user_object = dict(pickled[expected_user_id])
-
         # TODO: remove resetting the handful of keys here done because changes
         #       to make them assertion frienfly values will increase the size
         #       of the diff which, at time of commit, are best minimised.
@@ -124,9 +128,9 @@ def _generate_salt():
             'organization': 'Test Org',
             'organizational_unit': '',
             "password": "",
-            "password_hash": "PBKDF2$sha256$10000$b'CCCC12344321CCCC'$b'bph8p/avUq42IYeOdJoJuUqrJ7Q32eaT'",
+            "password_hash": expected_user_password_hash,
             'state': 'NA',
-            'unique_id': '__UNIQUE_ID__'
+            'unique_id': '__UNIQUE_ID__',
         })