From c98b750f814e08eeb47d3cd2894367f08cab0c39 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 20 Sep 2023 17:41:48 +0200 Subject: [PATCH] Python tests: Close open files Debug builds/modes of Python will complain loudly about unclosed files, making tests fail. --- tests/rpmpython.at | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/rpmpython.at b/tests/rpmpython.at index 68e1f8a4dc..7ec0405d32 100644 --- a/tests/rpmpython.at +++ b/tests/rpmpython.at @@ -225,6 +225,7 @@ try: myprint(h['arch']) except rpm.error as e: myprint(e) +sink.close() ], [public key not available ], @@ -232,7 +233,8 @@ except rpm.error as e: RPMPY_TEST([reading a signed package file 2],[ -keydata = open('${RPMDATA}/keys/rpm.org-rsa-2048-test.pub', 'rb').read() +with open('${RPMDATA}/keys/rpm.org-rsa-2048-test.pub', 'rb') as keydata_file: + keydata = keydata_file.read() pubkey = rpm.pubkey(keydata) keyring = rpm.keyring() keyring.addKey(pubkey) @@ -488,7 +490,8 @@ ts.closeDB() ts.openDB() c2 = ts.dbCookie() myprint(c1 == c2 != None) -open("dbcookie", "w+").write(c1) +with open("dbcookie", "w+") as dbcookie_file: + dbcookie_file.write(c1) ], [True ], @@ -507,9 +510,11 @@ runroot rpm -i \ RPMPY_CHECK([ ts.openDB() c1 = ts.dbCookie() -c2 = open("dbcookie", "r").read() +with open("dbcookie", "r") as dbcookie_file: + c2 = dbcookie_file.read() myprint(c1 != c2) -open("dbcookie", "w+").write(c1) +with open("dbcookie", "w+") as dbcookie_file: + dbcookie_file.write(c1) ], [True ], @@ -529,7 +534,8 @@ runroot rpm -i \ RPMPY_CHECK([ ts.openDB() c1 = ts.dbCookie() -c2 = open("dbcookie", "r").read() +with open("dbcookie", "r") as dbcookie_file: + c2 = dbcookie_file.read() myprint(c1 != c2) ], [True