From: Jay S. Bryant <jsbryant@us.ibm.com>
Date: Tue, 13 Jan 2015 22:25:24 +0000 (-0600)
Subject: Use lockutils.set_defaults to set lock_path in test
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1b2ce8b2ef648b9c00dee53b84ca00b2a05ae3e2;p=openstack-build%2Fcinder-build.git

Use lockutils.set_defaults to set lock_path in test

Commit 9dd6d212f0d8fd74c29077a786fb6d770a2a0bba for oslo.concurrency's
lockutils appears to have broken our unit tests.

Twelve of the the storwize_svc unit tests started failing with the
complaint that the required configuration option 'lock_path' was not set.

This change updates cinder/test.py to not only set up a temporary
lock_path location that will be automatically cleaned up, but to also
register that temporary lock_path location using lockutils.set_defaults()
to correct the problem.

Change-Id: I011888f676ebc170e7285048b7e5a638a5a8c9a9
Closes-bug: 1410485
---

diff --git a/cinder/test.py b/cinder/test.py
index 176baeaee..7fb7d95fb 100644
--- a/cinder/test.py
+++ b/cinder/test.py
@@ -189,6 +189,7 @@ class TestCase(testtools.TestCase):
             config_fixture.Config(lockutils.CONF))
         self.fixture.config(lock_path=lock_path,
                             group='oslo_concurrency')
+        lockutils.set_defaults(lock_path)
         self.override_config('policy_file',
                              os.path.join(
                                  os.path.abspath(