Switch to unified view

a/Allura/allura/tests/model/test_repo.py b/Allura/allura/tests/model/test_repo.py
...
...
115
        assert i['name_s'] == 'test1', i
115
        assert i['name_s'] == 'test1', i
116
116
117
    def test_scm_host_url(self):
117
    def test_scm_host_url(self):
118
        assert (
118
        assert (
119
            self.repo.clone_url('rw', 'nobody')
119
            self.repo.clone_url('rw', 'nobody')
120
            == 'svn+ssh://nobody@localhost:8022/scm-repo/p/test/test1/trunk'),\
120
            == 'svn+ssh://nobody@localhost:8022/scm-repo/p/test/test1/'),\
121
            self.repo.clone_url('rw', 'nobody')
121
            self.repo.clone_url('rw', 'nobody')
122
        assert (
122
        assert (
123
            self.repo.clone_url('https', 'nobody')
123
            self.repo.clone_url('https', 'nobody')
124
            == 'https://nobody@localhost:8022/scm-repo/p/test/test1/trunk'),\
124
            == 'https://nobody@localhost:8022/scm-repo/p/test/test1/'),\
125
            self.repo.clone_url('https', 'nobody')
125
            self.repo.clone_url('https', 'nobody')
126
126
127
    def test_merge_request(self):
127
    def test_merge_request(self):
128
        M.MergeRequest.upsert(app_config_id=c.app.config._id, status='open')
128
        M.MergeRequest.upsert(app_config_id=c.app.config._id, status='open')
129
        M.MergeRequest.upsert(app_config_id=c.app.config._id, status='closed')
129
        M.MergeRequest.upsert(app_config_id=c.app.config._id, status='closed')
...
...
240
        u = M.User.by_username('test-admin')
240
        u = M.User.by_username('test-admin')
241
        assert mr.creator == u
241
        assert mr.creator == u
242
        assert mr.creator_name == u.get_pref('display_name')
242
        assert mr.creator_name == u.get_pref('display_name')
243
        assert mr.creator_url == u.url()
243
        assert mr.creator_url == u.url()
244
        assert mr.downstream_url == '/p/test/test2/'
244
        assert mr.downstream_url == '/p/test/test2/'
245
        assert mr.downstream_repo_url == 'http://svn.localhost/p/test/test2/trunk'
245
        assert mr.downstream_repo_url == 'http://svn.localhost/p/test/test2/'
246
        assert mr.commits == [ self._make_commit('foo')[0] ]
246
        assert mr.commits == [ self._make_commit('foo')[0] ]
247
247
248
class TestLastCommitFor(_TestWithRepoAndCommit):
248
class TestLastCommitFor(_TestWithRepoAndCommit):
249
249
250
    def test_upsert(self):
250
    def test_upsert(self):