Commit d6f3e1aa authored by Stephen Morris's avatar Stephen Morris
Browse files

[1545] Corrected problems in setting environment variable in tests

For some reason, the Python "os.putenv()" did not work, so changed
to morifying the "os.environ" variable directly.
parent 23ba7abb
......@@ -32,11 +32,11 @@ class TestDhcpv4Daemon(unittest.TestCase):
#
# However, we do want to set the logging lock directory to somewhere
# to which we can write - use the current working directory. We then
# set the appropriate environment variable.
# set the appropriate environment variable. os.putenv() doesn't work
# on Ubuntu, so we access os.environ directly.
lockdir_envvar = "B10_LOCKFILE_DIR_FROM_BUILD"
lockdir = os.getenv(lockdir_envvar)
if lockdir is None:
os.putenv(lockdir_envvar, os.getcwd())
if lockdir_envvar not in os.environ:
os.environ[lockdir_envvar] = os.getcwd()
def tearDown(self):
pass
......
......@@ -32,11 +32,11 @@ class TestDhcpv6Daemon(unittest.TestCase):
#
# However, we do want to set the logging lock directory to somewhere
# to which we can write - use the current working directory. We then
# set the appropriate environment variable.
# set the appropriate environment variable. os.putenv() doesn't work
# on Ubuntu, so we access os.environ directly.
lockdir_envvar = "B10_LOCKFILE_DIR_FROM_BUILD"
lockdir = os.getenv(lockdir_envvar)
if lockdir is None:
os.putenv(lockdir_envvar, os.getcwd())
if lockdir_envvar not in os.environ:
os.environ[lockdir_envvar] = os.getcwd()
def tearDown(self):
pass
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment