You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/01/10 16:58:09 UTC
[12/16] git commit: [#6905] Update SVN tests to match new tarball
logic
[#6905] Update SVN tests to match new tarball logic
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6766c149
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6766c149
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6766c149
Branch: refs/heads/cj/7005
Commit: 6766c1493b2e43a5f012b089d3b59c288b34d025
Parents: 62f4b4f
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Jan 9 21:28:37 2014 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Jan 9 21:28:37 2014 +0000
----------------------------------------------------------------------
.../tests/functional/test_controllers.py | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6766c149/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 bd2941b..2cc0b9c 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -195,13 +195,13 @@ class TestRootController(SVNTestController):
r = self.app.get('/src/3/tree/')
assert 'Download Snapshot' in r
r = self.app.post('/src/3/tarball').follow()
- assert 'Checking snapshot status...' in r
+ assert 'Generating snapshot...' in r
r = self.app.get('/src/3/tarball')
- assert 'Checking snapshot status...' in r
+ assert 'Generating snapshot...' in r
M.MonQTask.run_ready()
ThreadLocalORMSession.flush_all()
r = self.app.get('/src/3/tarball_status')
- assert '{"status": "ready"}' in r
+ assert '{"status": "complete"}' in r
r = self.app.get('/src/3/tarball')
assert 'Your download will begin shortly' in r
@@ -210,13 +210,13 @@ class TestRootController(SVNTestController):
r = self.app.get('/src/6/tree/')
assert 'Download Snapshot' in r
r = self.app.post('/src/6/tarball').follow()
- assert 'Checking snapshot status...' in r
+ assert 'Generating snapshot...' in r
r = self.app.get('/src/6/tarball')
- assert 'Checking snapshot status...' in r
+ assert 'Generating snapshot...' in r
M.MonQTask.run_ready()
ThreadLocalORMSession.flush_all()
r = self.app.get('/src/6/tarball_status')
- assert '{"status": "ready"}' in r
+ assert '{"status": "complete"}' in r
r = self.app.get('/src/6/tarball')
assert 'Your download will begin shortly' in r
@@ -236,39 +236,39 @@ class TestRootController(SVNTestController):
assert_equal(form.find('input', attrs=dict(name='path')).get('value'), '/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'], 'na')
+ assert_equal(r.json['status'], None)
r = self.app.post('/p/test/svn-tags/19/tarball', dict(path='/tags/tag-1.0')).follow()
- assert 'Checking snapshot status...' in r
+ assert 'Generating snapshot...' in r
M.MonQTask.run_ready()
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/tags/tag-1.0')
- assert_equal(r.json['status'], 'ready')
+ assert_equal(r.json['status'], 'complete')
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/trunk')
- assert_equal(r.json['status'], 'na')
+ assert_equal(r.json['status'], None)
r = self.app.post('/p/test/svn-tags/19/tarball', dict(path='/trunk/')).follow()
- assert 'Checking snapshot status...' in r
+ assert 'Generating snapshot...' in r
M.MonQTask.run_ready()
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/trunk')
- assert_equal(r.json['status'], 'ready')
+ assert_equal(r.json['status'], 'complete')
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/branches/aaa/')
- assert_equal(r.json['status'], 'na')
+ 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('/p/test/svn-tags/19/tarball_status?path=/trunk/some/path/')
- assert_equal(r.json['status'], 'ready')
+ assert_equal(r.json['status'], 'complete')
r = self.app.get('/p/test/svn-tags/19/tarball_status')
- assert_equal(r.json['status'], 'ready')
+ assert_equal(r.json['status'], 'complete')
# ...the same as trunk, 'cause concrete tag isn't specified
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/tags/')
- assert_equal(r.json['status'], 'ready')
+ assert_equal(r.json['status'], 'complete')
# ...the same as trunk, 'cause concrete branch isn't specified
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/branches/')
- assert_equal(r.json['status'], 'ready')
+ assert_equal(r.json['status'], 'complete')
# ...this is essentially the same as tag snapshot
r = self.app.get('/p/test/svn-tags/19/tarball_status?path=/tags/tag-1.0/dir')
- assert_equal(r.json['status'], 'ready')
+ assert_equal(r.json['status'], 'complete')
class TestImportController(SVNTestController):