You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/11/21 20:59:12 UTC
git commit: Pass byte-string so python doesn't attempt decode to ascii
Updated Branches:
refs/heads/master 496d263ae -> 8ec5847c1
Pass byte-string so python doesn't attempt decode to ascii
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/8ec5847c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8ec5847c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8ec5847c
Branch: refs/heads/master
Commit: 8ec5847c1d2ba24299fa0a67456bfc30de4aeca3
Parents: 496d263
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Nov 21 19:58:45 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Nov 21 19:58:45 2013 +0000
----------------------------------------------------------------------
ForgeSVN/forgesvn/tests/functional/test_controllers.py | 2 +-
ForgeSVN/forgesvn/tests/model/test_repository.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8ec5847c/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 6ff1bf6..bd2941b 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -47,7 +47,7 @@ class SVNTestController(TestController):
c.app.repo.name = name
c.app.repo.refresh()
if os.path.isdir(c.app.repo.tarball_path):
- shutil.rmtree(c.app.repo.tarball_path)
+ shutil.rmtree(c.app.repo.tarball_path.encode('utf-8'))
ThreadLocalORMSession.flush_all()
ThreadLocalORMSession.close_all()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8ec5847c/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 a51c109..9990bdb 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -424,7 +424,7 @@ class TestSVNRepo(unittest.TestCase, RepoImplTestBase):
assert os.path.isfile(os.path.join(tmpdir, "svn/t/te/test/testsvn/test-src-1.zip"))
tarball_zip = ZipFile(os.path.join(tmpdir, 'svn/t/te/test/testsvn/test-src-1.zip'), 'r')
assert_equal(tarball_zip.namelist(), ['test-src-1/', 'test-src-1/README'])
- shutil.rmtree(self.repo.tarball_path, ignore_errors=True)
+ shutil.rmtree(self.repo.tarball_path.encode('utf-8'), ignore_errors=True)
@onlyif(os.path.exists(tg.config.get('scm.repos.tarball.zip_binary', '/usr/bin/zip')), 'zip binary is missing')
def test_tarball_aware_of_tags(self):