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 2015/04/15 18:23:32 UTC
allura git commit: svn tests
Repository: allura
Updated Branches:
refs/heads/db/7870 a04d77fed -> 0af94c3ad
svn tests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0af94c3a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0af94c3a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0af94c3a
Branch: refs/heads/db/7870
Commit: 0af94c3adb27cfe0c115a702b044e2150f2b0498
Parents: a04d77f
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Apr 15 16:23:17 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Apr 15 16:23:17 2015 +0000
----------------------------------------------------------------------
Allura/test.ini | 6 ++++++
ForgeSVN/forgesvn/tests/model/test_repository.py | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/0af94c3a/Allura/test.ini
----------------------------------------------------------------------
diff --git a/Allura/test.ini b/Allura/test.ini
index a309a1d..a3bb23e 100644
--- a/Allura/test.ini
+++ b/Allura/test.ini
@@ -55,8 +55,14 @@ ew.url_base = /nf/_ew_/
static.script_name = /nf/_static_/
static.url_base = /nf/_static_/
+; tests check for these values in output
scm.host.ro.git = git://git.localhost$path
scm.host.rw.git = ssh://$username@localhost:8022/scm-repo$path
+scm.host.ro.svn = http://svn.localhost$path/
+scm.host.rw.svn = svn+ssh://$username@localhost:8022/scm-repo$path/
+scm.host.https.svn = https://$username@localhost:8022/scm-repo$path/
+scm.host.ro.hg = http://hg.localhost$path
+scm.host.rw.hg = ssh://$username@localhost:8022/scm-repo$path
scm.repos.root = /tmp
scm.repos.tarball.enable = true
http://git-wip-us.apache.org/repos/asf/allura/blob/0af94c3a/ForgeSVN/forgesvn/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 92ccaf5..6276df8 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -169,7 +169,7 @@ class TestSVNRepo(unittest.TestCase, RepoImplTestBase):
with open(os.path.join(g.tmpdir, 'testsvn/hooks/post-commit')) as f:
hook_data = f.read()
self.assertIn(
- 'curl -s http://localhost/auth/refresh_repo/p/test/src/\n',
+ 'curl -s http://localhost:8080/auth/refresh_repo/p/test/src/\n',
hook_data)
self.assertIn('exec $DIR/post-commit-user "$@"\n', hook_data)
@@ -221,7 +221,7 @@ class TestSVNRepo(unittest.TestCase, RepoImplTestBase):
with open(os.path.join(g.tmpdir, 'testsvn/hooks/post-commit')) as f:
c = f.read()
self.assertIn(
- 'curl -s http://localhost/auth/refresh_repo/p/test/src/\n', c)
+ 'curl -s http://localhost:8080/auth/refresh_repo/p/test/src/\n', c)
self.assertIn('exec $DIR/post-commit-user "$@"\n', c)
repo.refresh(notify=False)
@@ -696,7 +696,7 @@ class TestSVNRev(unittest.TestCase):
n = M.Notification.query.find(
dict(subject='[test:src] [r1] - rick446: Create readme')).first()
assert n
- assert_equal(n.text, 'Create readme http://localhost/p/test/src/1/')
+ assert_equal(n.text, 'Create readme http://localhost:8080/p/test/src/1/')
class _Test(unittest.TestCase):
@@ -890,7 +890,7 @@ class TestRepo(_TestWithRepo):
notifications = M.Notification.query.find().all()
for n in notifications:
if '100 new commits' in n.subject:
- assert "master,branch: by %s http://localhost/ci/foo99" % committer_name in n.text
+ assert "master,branch: by %s http://localhost:8080/ci/foo99" % committer_name in n.text
break
else:
assert False, 'Did not find notification'