Merge with -core's diverged trunk.
This commit is contained in:
2
debian/control
vendored
2
debian/control
vendored
@@ -2,7 +2,7 @@ Source: nova
|
|||||||
Section: net
|
Section: net
|
||||||
Priority: extra
|
Priority: extra
|
||||||
Maintainer: Jesse Andrews <jesse@ansolabs.com>
|
Maintainer: Jesse Andrews <jesse@ansolabs.com>
|
||||||
Build-Depends: debhelper (>= 7)
|
Build-Depends: debhelper (>= 7), redis-server (>=2:2.0.0~rc1), python-m2crypto
|
||||||
Build-Depends-Indep: python-support, python-setuptools
|
Build-Depends-Indep: python-support, python-setuptools
|
||||||
Standards-Version: 3.8.4
|
Standards-Version: 3.8.4
|
||||||
XS-Python-Version: 2.6
|
XS-Python-Version: 2.6
|
||||||
|
@@ -38,9 +38,12 @@ oss_tempdir = tempfile.mkdtemp(prefix='test_oss-')
|
|||||||
|
|
||||||
# delete tempdirs from previous runs (we don't delete after test to allow
|
# delete tempdirs from previous runs (we don't delete after test to allow
|
||||||
# checking the contents after running tests)
|
# checking the contents after running tests)
|
||||||
for path in glob.glob(os.path.abspath(os.path.join(oss_tempdir, '../test_oss-*'))):
|
# TODO: This fails on the test box with a permission denied error
|
||||||
if path != oss_tempdir:
|
# Also, doing these things in a global tempdir means that different runs of
|
||||||
shutil.rmtree(path)
|
# the test suite on the same box could clobber each other.
|
||||||
|
#for path in glob.glob(os.path.abspath(os.path.join(oss_tempdir, '../test_oss-*'))):
|
||||||
|
# if path != oss_tempdir:
|
||||||
|
# shutil.rmtree(path)
|
||||||
|
|
||||||
|
|
||||||
# create bucket/images path
|
# create bucket/images path
|
||||||
|
Reference in New Issue
Block a user