From 1b8ac555ee1443be5cd14614cc6b722960d228b8 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Tue, 15 Aug 2017 14:34:56 +0300 Subject: oeqa: fix temp file handling in dnf package feed test Prevent stale temp files and a possible (if unlikely) race in tempfile usage. Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'meta-selftest') diff --git a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py index 123e7259f1..68e56f2c5e 100644 --- a/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py +++ b/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py @@ -6,6 +6,8 @@ class DnfSelftest(DnfTest): @classmethod def setUpClass(cls): + import tempfile + cls.temp_dir = tempfile.TemporaryDirectory(prefix="oeqa-remotefeeds-") cls.repo_server = HTTPService(os.path.join(cls.tc.td['WORKDIR'], 'oe-rootfs-repo'), cls.tc.target.server_ip) cls.repo_server.start() @@ -13,6 +15,7 @@ class DnfSelftest(DnfTest): @classmethod def tearDownClass(cls): cls.repo_server.stop() + cls.temp_dir.cleanup() @OETestDepends(['dnf.DnfBasicTest.test_dnf_help']) def test_verify_package_feeds(self): @@ -25,11 +28,11 @@ class DnfSelftest(DnfTest): """ # When we created an image, we had to supply fake ip and port # for the feeds. Now we can patch the real ones into the config file. - import tempfile - temp_file = tempfile.TemporaryDirectory(prefix="oeqa-remotefeeds-").name + temp_file = os.path.join(self.temp_dir.name, 'tmp.repo') self.tc.target.copyFrom("/etc/yum.repos.d/oe-remote-repo.repo", temp_file) fixed_config = open(temp_file, "r").read().replace("bogus_ip", self.tc.target.server_ip).replace("bogus_port", str(self.repo_server.port)) - open(temp_file, "w").write(fixed_config) + with open(temp_file, "w") as f: + f.write(fixed_config) self.tc.target.copyTo(temp_file, "/etc/yum.repos.d/oe-remote-repo.repo") import re -- cgit 1.2.3-korg