You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/06/03 15:37:53 UTC
[11/21] git commit: [#6235] ticket:366 Fix tests
[#6235] ticket:366 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6a77c658
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6a77c658
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6a77c658
Branch: refs/heads/master
Commit: 6a77c658413aba128cad594526e5da558acf3109
Parents: e406447
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed May 29 06:12:19 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri May 31 22:14:09 2013 +0000
----------------------------------------------------------------------
.../forgegit/tests/functional/test_controllers.py | 2 +-
.../forgesvn/tests/functional/test_controllers.py | 26 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6a77c658/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 787cef1..fd61b4a 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -353,7 +353,7 @@ class TestRootController(_TestCase):
r = self.app.get('/p/test/testgit-index/ci/master/tree/index/')
links = r.html.findAll('a')
download_link = [a for a in links if a.text == 'Download Snapshot'][0]
- assert_equal(download_link.get('href'), '/p/test/testgit-index/ci/master/tarball')
+ assert_equal(download_link.get('href'), '/p/test/testgit-index/ci/master/tarball?path=/index')
class TestRestController(_TestCase):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6a77c658/ForgeSVN/forgesvn/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/functional/test_controllers.py b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
index 2575f58..e07543a 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -203,51 +203,51 @@ class TestRootController(SVNTestController):
def test_tarball_tags_aware(self):
h.set_context('test', 'svn-tags', neighborhood='Projects')
shutil.rmtree(c.app.repo.tarball_path, ignore_errors=True)
- r = self.app.get('/svn-tags/19/tree/')
+ r = self.app.get('/p/test/svn-tags/19/tree/')
link = r.html.find('h2', attrs={'class': 'dark title'})
link = link.find('small').findAll('a')[0]
assert_equal(link.text, 'Download Snapshot')
assert_equal(link.get('href'), '/p/test/svn-tags/19/tarball')
- r = self.app.get('/svn-tags/19/tree/tags/tag-1.0/')
+ r = self.app.get('/p/test/svn-tags/19/tree/tags/tag-1.0/')
link = r.html.find('h2', attrs={'class': 'dark title'})
link = link.find('small').findAll('a')[0]
assert_equal(link.text, 'Download Snapshot')
assert_equal(link.get('href'), '/p/test/svn-tags/19/tarball?path=/tags/tag-1.0')
- r = self.app.get('/svn-tags/19/tarball_status?path=/tags/tag-1.0')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/tags/tag-1.0')
assert_equal(r.json['status'], None)
r = self.app.get(link.get('href'))
assert 'Generating snapshot...' in r
M.MonQTask.run_ready()
- r = self.app.get('/svn-tags/19/tarball_status?path=/tags/tag-1.0')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/tags/tag-1.0')
assert_equal(r.json['status'], 'ready')
- r = self.app.get('/svn-tags/19/tarball_status?path=/trunk')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/trunk')
assert_equal(r.json['status'], None)
- r = self.app.get('/svn-tags/19/tarball?path=/trunk/')
+ r = self.app.get('/p/test/svn-tags/19/tarball?path=/trunk/')
assert 'Generating snapshot...' in r
M.MonQTask.run_ready()
- r = self.app.get('/svn-tags/19/tarball_status?path=/trunk')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/trunk')
assert_equal(r.json['status'], 'ready')
- r = self.app.get('/svn-tags/19/tarball_status?path=/branches/aaa/')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/branches/aaa/')
assert_equal(r.json['status'], None)
# All of the following also should be ready because...
# ...this is essentially the same as trunk snapshot
- r = self.app.get('/svn-tags/19/tarball_status?path=/trunk/some/path/')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/trunk/some/path/')
assert_equal(r.json['status'], 'ready')
- r = self.app.get('/svn-tags/19/tarball_status')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status')
assert_equal(r.json['status'], 'ready')
# ...the same as trunk, 'cause concrete tag isn't specified
- r = self.app.get('/svn-tags/19/tarball_status?path=/tags/')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/tags/')
assert_equal(r.json['status'], 'ready')
# ...the same as trunk, 'cause concrete branch isn't specified
- r = self.app.get('/svn-tags/19/tarball_status?path=/branches/')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/branches/')
assert_equal(r.json['status'], 'ready')
# ...this is essentially the same as tag snapshot
- r = self.app.get('/svn-tags/19/tarball_status?path=/tags/tag-1.0/dir')
+ r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/tags/tag-1.0/dir')
assert_equal(r.json['status'], 'ready')