Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 15163)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 15287)
@@ -37,4 +37,5 @@
 from waeup.kofa.university.faculty import Faculty
 from waeup.kofa.university.department import Department
+from waeup.kofa.tests.test_authentication import SECRET
 
 SAMPLE_FILE = os.path.join(os.path.dirname(__file__), 'test_file.csv')
@@ -359,5 +360,5 @@
     def test_export_accesscodes(self):
         # Create portal manager and an ExportManager
-        self.app['users'].addUser('mrportal', 'mrportalsecret')
+        self.app['users'].addUser('mrportal', SECRET)
         self.app['users']['mrportal'].email = 'mrportal@foo.ng'
         self.app['users']['mrportal'].title = 'Carlo Pitter'
@@ -365,5 +366,5 @@
         prmlocal = IPrincipalRoleManager(self.app)
         prmlocal.assignRoleToPrincipal('waeup.PortalManager', 'mrportal')
-        self.app['users'].addUser('mrexporter', 'mrexportersecret')
+        self.app['users'].addUser('mrexporter', SECRET)
         self.app['users']['mrexporter'].email = 'mrexporter@foo.ng'
         self.app['users']['mrexporter'].title = 'Carlos Potter'
@@ -374,5 +375,5 @@
         self.browser.open('http://localhost/app/login')
         self.browser.getControl(name="form.login").value = 'mrportal'
-        self.browser.getControl(name="form.password").value = 'mrportalsecret'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
 
@@ -401,5 +402,5 @@
         self.browser.open('http://localhost/app/login')
         self.browser.getControl(name="form.login").value = 'mrexporter'
-        self.browser.getControl(name="form.password").value = 'mrexportersecret'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
 
@@ -501,5 +502,5 @@
         login_path = 'http://localhost/app/login'
         # Create  officer
-        self.app['users'].addUser('officer', 'officersecret')
+        self.app['users'].addUser('officer', SECRET)
         self.app['users']['officer'].email = 'mrofficer@foo.ng'
         self.app['users']['officer'].title = 'Carlo Pitter'
@@ -510,5 +511,5 @@
         self.browser.open(login_path)
         self.browser.getControl(name="form.login").value = 'officer'
-        self.browser.getControl(name="form.password").value = 'officersecret'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         self.browser.open(upload_path)
@@ -562,10 +563,10 @@
     def test_suspended_officer(self):
         self.app['users'].addUser(
-            'officer', 'secret', title='Bob Officer', email='bob@abcd.ng')
+            'officer', SECRET, title='Bob Officer', email='bob@abcd.ng')
         # Officer can't login if their password is not set.
         self.app['users']['officer'].password = None
         self.browser.open('http://localhost/app/login')
         self.browser.getControl(name="form.login").value = 'officer'
-        self.browser.getControl(name="form.password").value = 'secret'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         self.assertTrue(
@@ -573,13 +574,13 @@
         # We set the password again.
         IUserAccount(
-            self.app['users']['officer']).setPassword('secret')
+            self.app['users']['officer']).setPassword(SECRET)
         # Officers can't login if their account is suspended/deactivated.
         self.app['users']['officer'].suspended = True
         self.browser.open('http://localhost/app/login')
         self.browser.getControl(name="form.login").value = 'officer'
-        self.browser.getControl(name="form.password").value = 'secret'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         self.assertMatches(
-            '...but yor account has been temporarily deactivated...',
+            '...but your account has been temporarily deactivated...',
             self.browser.contents)
         # Officer is really not logged in.
@@ -588,5 +589,5 @@
         self.browser.open('http://localhost/app/login')
         self.browser.getControl(name="form.login").value = 'officer'
-        self.browser.getControl(name="form.password").value = 'secret'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         # Yeah, officer logged in.
@@ -618,8 +619,8 @@
         config = grok.getSite()['configuration']
         self.app['users'].addUser(
-            'officer', 'secret', title='Bob Officer', email='bob@abcd.ng')
+            'officer', SECRET, title='Bob Officer', email='bob@abcd.ng')
         self.browser.open('http://localhost/app/login')
         self.browser.getControl(name="form.login").value = 'officer'
-        self.browser.getControl(name="form.password").value = 'secret'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         # Officer logged in.
@@ -636,5 +637,5 @@
         # Officers really can't login if maintenance mode is enabled.
         self.browser.getControl(name="form.login").value = 'officer'
-        self.browser.getControl(name="form.password").value = 'secret'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         # A second warning is raised.
@@ -645,5 +646,5 @@
         config.maintmode_enabled_by = u'officer'
         self.browser.getControl(name="form.login").value = 'officer'
-        self.browser.getControl(name="form.password").value = 'secret'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         self.assertTrue('You logged in' in self.browser.contents)
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_permissions.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_permissions.py	(revision 15163)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_permissions.py	(revision 15287)
@@ -37,5 +37,5 @@
     remove_logger)
 from waeup.kofa.tests.test_async import FunctionalAsyncTestCase
-
+from waeup.kofa.tests.test_authentication import SECRET
 
 
@@ -157,5 +157,5 @@
     def testReportsPermissions(self):
         # Create reports officer
-        self.app['users'].addUser('mrofficer', 'mrofficer')
+        self.app['users'].addUser('mrofficer', SECRET)
         self.app['users']['mrofficer'].email = 'mrofficer@foo.ng'
         self.app['users']['mrofficer'].title = 'Otto Report'
@@ -163,5 +163,5 @@
         prmglobal.assignRoleToPrincipal('waeup.ReportsOfficer', 'mrofficer')
         # Create reports manager
-        self.app['users'].addUser('mrmanager', 'mrmanager')
+        self.app['users'].addUser('mrmanager', SECRET)
         self.app['users']['mrmanager'].email = 'mrmanager@foo.ng'
         self.app['users']['mrmanager'].title = 'Manfred Report'
@@ -171,5 +171,5 @@
         self.browser.open('http://localhost/app/login')
         self.browser.getControl(name="form.login").value = 'mrofficer'
-        self.browser.getControl(name="form.password").value = 'mrofficer'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         self.trigger_report_creation('2004')
@@ -184,5 +184,5 @@
         self.browser.open('http://localhost/app/login')
         self.browser.getControl(name="form.login").value = 'mrmanager'
-        self.browser.getControl(name="form.password").value = 'mrmanager'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         self.trigger_report_creation('2005')
@@ -199,5 +199,5 @@
         self.browser.open('http://localhost/app/login')
         self.browser.getControl(name="form.login").value = 'mrofficer'
-        self.browser.getControl(name="form.password").value = 'mrofficer'
+        self.browser.getControl(name="form.password").value = SECRET
         self.browser.getControl("Login").click()
         self.browser.open('http://localhost/app/reports')
