From 226708b27ef3fb2eed1f89f8b4903bab833662f4 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 24 Jun 2019 09:24:27 -0700 Subject: [PATCH] tests: rpm now returns str, drop decode() call Related: rhbz#1785154 --- tests/pylorax/test_gitrpm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/pylorax/test_gitrpm.py b/tests/pylorax/test_gitrpm.py index 49093a4f..b59a2a09 100644 --- a/tests/pylorax/test_gitrpm.py +++ b/tests/pylorax/test_gitrpm.py @@ -151,10 +151,10 @@ class GitRpmTest(unittest.TestCase): hdr = ts.hdrFromFdno(fd) os.close(fd) - self.assertEqual(hdr[rpm.RPMTAG_NAME].decode("UTF-8"), repo["rpmname"]) - self.assertEqual(hdr[rpm.RPMTAG_VERSION].decode("UTF-8"), repo["rpmversion"]) - self.assertEqual(hdr[rpm.RPMTAG_RELEASE].decode("UTF-8"), repo["rpmrelease"]) - self.assertEqual(hdr[rpm.RPMTAG_URL].decode("UTF-8"), repo["repo"]) + self.assertEqual(hdr[rpm.RPMTAG_NAME], repo["rpmname"]) + self.assertEqual(hdr[rpm.RPMTAG_VERSION], repo["rpmversion"]) + self.assertEqual(hdr[rpm.RPMTAG_RELEASE], repo["rpmrelease"]) + self.assertEqual(hdr[rpm.RPMTAG_URL], repo["repo"]) files = sorted(f.name for f in rpm.files(hdr) if stat.S_ISREG(f.mode)) self.assertEqual(files, [os.path.join(repo["destination"], f) for f in self.test_results[test_name]])