[4/5] allura git commit: All four passed.

[br...@apache.org]

All four passed.


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0ae6aa09
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0ae6aa09
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0ae6aa09

Branch: refs/heads/master
Commit: 0ae6aa09a93f716d2741506da3b3cce46b750cb2
Parents: a9d9ae0
Author: dastanforever <pr...@gmail.com>
Authored: Sat Jan 16 13:00:27 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Feb 5 12:22:44 2016 -0500

----------------------------------------------------------------------
 Allura/allura/tests/functional/test_site_admin.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/0ae6aa09/Allura/allura/tests/functional/test_site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index b55dcbc..a8fa810 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -676,14 +676,15 @@ class TestUserDetails(TestController):
                 'username': 'test-user',
                 'addr-1.ord': '1',
                 'addr-2.ord': '2',
-                'addr-2.delete': 'on',
+                'addr-3.ord': '3',
+                'addr-3.delete': 'on',
                 'new_addr.addr': '',
                 'primary_addr': 'test2@example.com'},
                 extra_environ=dict(username='test-admin'))
         r = self.app.get('/nf/admin/user/test-user')
         user = M.User.query.get(username='test-user')
         # test@example.com set as primary since test2@example.com is deleted
-        assert_equal(user.get_pref('email_address'), 'test@example.com')
+        assert_equal(user.get_pref('email_address'), 'test-user@allura.local')
 
     @patch.object(LocalAuthenticationProvider, 'set_password')
     def test_set_random_password(self, set_password):