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 2013/06/03 21:19:14 UTC
[15/38] git commit: [#6235] ticket:352 Don't run test for snapshot if
zip binary isn't available
[#6235] ticket:352 Don't run test for snapshot if zip binary isn't available
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d0edb5c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d0edb5c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d0edb5c2
Branch: refs/heads/cj/6218
Commit: d0edb5c2fa3300bc8d9aeaceb1a7537cb004a5f8
Parents: 2e55361
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri May 17 16:51:12 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri May 31 22:14:09 2013 +0000
----------------------------------------------------------------------
.../forgesvn/tests/functional/test_controllers.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d0edb5c2/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 5a69ee6..2575f58 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -17,11 +17,14 @@
import json
import shutil
+import os
+import tg
import pkg_resources
from pylons import tmpl_context as c
from ming.orm import ThreadLocalORMSession
from nose.tools import assert_equal
+from IPython.testing.decorators import onlyif
from allura import model as M
from allura.lib import helpers as h
@@ -185,6 +188,7 @@ class TestRootController(SVNTestController):
r = self.app.get('/src/2/log/?path=does/not/exist/')
assert 'No (more) commits' in r
+ @onlyif(os.path.exists(tg.config.get('scm.repos.tarball.zip_binary', '/usr/bin/zip')), 'zip binary is missing')
def test_tarball(self):
r = self.app.get('/src/3/tree/')
assert 'Download Snapshot' in r
@@ -195,6 +199,7 @@ class TestRootController(SVNTestController):
r = self.app.get('/src/3/tarball_status')
assert '{"status": "ready"}' in r
+ @onlyif(os.path.exists(tg.config.get('scm.repos.tarball.zip_binary', '/usr/bin/zip')), 'zip binary is missing')
def test_tarball_tags_aware(self):
h.set_context('test', 'svn-tags', neighborhood='Projects')
shutil.rmtree(c.app.repo.tarball_path, ignore_errors=True)