aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2014-06-06 13:43:02 +0300
committermattip <matti.picus@gmail.com>2014-06-06 13:43:02 +0300
commit99e0833b4d6c7767500f3d28a6e5e8d4741199bd (patch)
tree924a50cc3b04017f54ef65f7d12d4ba48fce1f96
parentmerge default into release (diff)
downloadpypy-99e0833b4d6c7767500f3d28a6e5e8d4741199bd.tar.gz
pypy-99e0833b4d6c7767500f3d28a6e5e8d4741199bd.tar.bz2
pypy-99e0833b4d6c7767500f3d28a6e5e8d4741199bd.zip
-rw-r--r--pypy/tool/release/test/test_package.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pypy/tool/release/test/test_package.py b/pypy/tool/release/test/test_package.py
index 3ad75329c1..bada67e145 100644
--- a/pypy/tool/release/test/test_package.py
+++ b/pypy/tool/release/test/test_package.py
@@ -108,7 +108,7 @@ def test_fix_permissions(tmpdir):
check(pypy, 0755)
def test_generate_license():
- from os.path import dirname, abspath, join
+ from os.path import dirname, abspath
class Options(object):
pass
options = Options()
@@ -120,7 +120,7 @@ def test_generate_license():
options.license_base = dirname(basedir) + '/local'
else:
options.license_base = '/usr/share/doc'
- license = package.generate_license(join(basedir,'LICENSE'), options)
+ license = package.generate_license(py.path.local(basedir), options)
assert 'bzip2' in license
assert 'openssl' in license
assert 'Tcl' in license