1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/6b635cb8191d/ changeset: 6b635cb8191d user: jgoecks date: 2012-01-17 15:05:11 summary: Update functional tests to be compatible with 0d1d62b8be2e affected #: 2 files
diff -r 2272101e8c292bd33e78cdcee37bac4a62cd5cb4 -r 6b635cb8191d0ce91e60f8e2cc5ec1606b1c1720 test/base/twilltestcase.py --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -831,12 +831,12 @@ previously_created = True except: try: - self.check_page_for_string( 'This user name is not available' ) + self.check_page_for_string( 'Public name is taken; please choose another' ) username_taken = True except: try: # Note that we're only checking if the usr name is >< 4 chars here... - self.check_page_for_string( 'User name must be at least 4 characters in length' ) + self.check_page_for_string( 'Public name must be at least 4 characters in length' ) invalid_username = True except: pass @@ -1218,12 +1218,12 @@ previously_created = True except: try: - self.check_page_for_string( 'This user name is not available' ) + self.check_page_for_string( 'Public name is taken; please choose another' ) username_taken = True except: try: # Note that we're only checking if the usr name is >< 4 chars here... - self.check_page_for_string( 'User name must be at least 4 characters in length' ) + self.check_page_for_string( 'Public name must be at least 4 characters in length' ) invalid_username = True except: pass
diff -r 2272101e8c292bd33e78cdcee37bac4a62cd5cb4 -r 6b635cb8191d0ce91e60f8e2cc5ec1606b1c1720 test/functional/test_admin_features.py --- a/test/functional/test_admin_features.py +++ b/test/functional/test_admin_features.py @@ -32,7 +32,7 @@ webapp='galaxy', referer='' ) if not username_taken: - raise AssertionError, "The user name (%s) is already being used by another user, but no error was displayed" \ + raise AssertionError, "The public name (%s) is already being used by another user, but no error was displayed" \ % 'admin-user' # Test setting the user name to an invalid one. Note that the account must not exist in order # for this test to work as desired, so the email we're passing is important... @@ -42,7 +42,7 @@ webapp='galaxy', referer='' ) if not invalid_username: - raise AssertionError, "The user name (%s) is is invalid, but no error was displayed" % username + raise AssertionError, "The public name (%s) is is invalid, but no error was displayed" % username previously_created, username_taken, invalid_username = self.create_new_account_as_admin( email=email, password=password, username='regular-user3',
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.