diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-15 10:52:11 -0500 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-15 10:52:11 -0500 |
| commit | 122fe2b75f635df0aa3858d05ed6775b76a9776e (patch) | |
| tree | 3ea1bb9576e81171f023e80bdc3900cb99a2034f | |
| parent | 89157b250032e5a819742e4ed537222898bcdf25 (diff) | |
| parent | 97665db528eecc3892beaaaacba2b9d1c3b7c5ea (diff) | |
| download | nova-122fe2b75f635df0aa3858d05ed6775b76a9776e.tar.gz nova-122fe2b75f635df0aa3858d05ed6775b76a9776e.tar.xz nova-122fe2b75f635df0aa3858d05ed6775b76a9776e.zip | |
Merge with -core's diverged trunk.
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | nova/tests/objectstore_unittest.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/debian/control b/debian/control index 342dfb185..17414bb7a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: nova Section: net Priority: extra 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 Standards-Version: 3.8.4 XS-Python-Version: 2.6 diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py index 7f85b8ee5..ca2d31159 100644 --- a/nova/tests/objectstore_unittest.py +++ b/nova/tests/objectstore_unittest.py @@ -38,9 +38,12 @@ oss_tempdir = tempfile.mkdtemp(prefix='test_oss-') # delete tempdirs from previous runs (we don't delete after test to allow # checking the contents after running tests) -for path in glob.glob(os.path.abspath(os.path.join(oss_tempdir, '../test_oss-*'))): - if path != oss_tempdir: - shutil.rmtree(path) +# TODO: This fails on the test box with a permission denied error +# Also, doing these things in a global tempdir means that different runs of +# 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 |