Merge "Fix ResourceWarning: unclosed file"
This commit is contained in:
commit
a54ea2d01a
|
@ -546,7 +546,8 @@ class TestCreateOvercloudRC(TestCase):
|
||||||
try:
|
try:
|
||||||
utils.write_overcloudrc(stack_name, overcloudrcs,
|
utils.write_overcloudrc(stack_name, overcloudrcs,
|
||||||
config_directory=tempdir)
|
config_directory=tempdir)
|
||||||
rc = open(rcfile, 'rt').read()
|
with open(rcfile, 'rt') as f:
|
||||||
|
rc = f.read()
|
||||||
self.assertEqual('overcloudrc', rc)
|
self.assertEqual('overcloudrc', rc)
|
||||||
finally:
|
finally:
|
||||||
if os.path.exists(rcfile):
|
if os.path.exists(rcfile):
|
||||||
|
@ -561,7 +562,8 @@ class TestCreateTempestDeployerInput(TestCase):
|
||||||
with tempfile.NamedTemporaryFile() as cfgfile:
|
with tempfile.NamedTemporaryFile() as cfgfile:
|
||||||
filepath = cfgfile.name
|
filepath = cfgfile.name
|
||||||
utils.create_tempest_deployer_input(filepath)
|
utils.create_tempest_deployer_input(filepath)
|
||||||
cfg = open(filepath, 'rt').read()
|
with open(filepath, 'rt') as f:
|
||||||
|
cfg = f.read()
|
||||||
# Just make a simple test, to make sure it created a proper file:
|
# Just make a simple test, to make sure it created a proper file:
|
||||||
self.assertIn(
|
self.assertIn(
|
||||||
'[volume-feature-enabled]\nbootable = true', cfg)
|
'[volume-feature-enabled]\nbootable = true', cfg)
|
||||||
|
|
Loading…
Reference in New Issue