From fcc4bafff0eb1c08845ea5156760447070921088 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 14 Jul 2010 22:04:27 +0000 Subject: [PATCH 1/2] Added build-deps to debian/control that are needed to run test suite. Fixed an error in a test case. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a50e6ecf..ebb8db3d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: nova Section: net Priority: extra Maintainer: Jesse Andrews -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 7), nettle-bin, redis-server (>=2:2.0.0~rc1), python-m2crypto, lsh-utils Build-Depends-Indep: python-support Standards-Version: 3.8.4 XS-Python-Version: 2.6 From df1b7c0271d33c5f4952e7ed6b504b6e4e233cd2 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 15 Jul 2010 08:44:25 -0500 Subject: [PATCH 2/2] Disabled a tmpdir cleanup. --- nova/tests/objectstore_unittest.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py index 89c1d59c..17946bb2 100644 --- a/nova/tests/objectstore_unittest.py +++ b/nova/tests/objectstore_unittest.py @@ -41,9 +41,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