openstack/swift
Code Issues Proposed changes

Only set PYTHON_EGG_CACHE if it isn't already set

Browse Source 
Change-Id: I6503c80a236a1720562377d04313ee2688336c85
This commit is contained in:
Chuck Thier 2013-08-29 16:32:30 +00:00
parent dd15594157
commit 6570c24d45
2 changed files with 6 additions and 3 deletions
swift/common
manager.py
test/unit/common
test_manager.py

3
swift/common/manager.py

@ -63,7 +63,8 @@ def setup_env():
print _("WARNING: Unable to increase file descriptor limit. "
"Running as non-root?")
os.environ['PYTHON_EGG_CACHE'] = '/tmp'
# Set PYTHON_EGG_CACHE if it isn't already set
os.environ.setdefault('PYTHON_EGG_CACHE', '/tmp')
def command(func):

6
test/unit/common/test_manager.py

@ -107,14 +107,16 @@ class TestManagerModule(unittest.TestCase):
manager.MAX_MEMORY)),
]
self.assertEquals(manager.resource.called_with_args, expected)
self.assertEquals(manager.os.environ['PYTHON_EGG_CACHE'], '/tmp')
self.assertTrue(
manager.os.environ['PYTHON_EGG_CACHE'].startswith('/tmp'))
# test error condition
manager.resource = MockResource(error=ValueError())
manager.os.environ = {}
manager.setup_env()
self.assertEquals(manager.resource.called_with_args, [])
self.assertEquals(manager.os.environ['PYTHON_EGG_CACHE'], '/tmp')
self.assertTrue(
manager.os.environ['PYTHON_EGG_CACHE'].startswith('/tmp'))
manager.resource = MockResource(error=OSError())
manager.os.environ = {}