From 6b8e5355463969a3934a3f1bf0bc18f2b05364b7 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sun, 22 Apr 2018 20:41:38 +0200 Subject: [PATCH] packages.tests: convert response.content to str --- packages/tests.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/tests.py b/packages/tests.py index ebbedf42..18961190 100644 --- a/packages/tests.py +++ b/packages/tests.py @@ -120,52 +120,52 @@ class PackageSearch(TestCase): def test_invalid(self): response = self.client.get('/packages/?q=test') self.assertEqual(response.status_code, 200) - self.assertIn('0 matching packages found', response.content) + self.assertIn('0 matching packages found', response.content.decode()) def test_exact_match(self): response = self.client.get('/packages/?q=linux') self.assertEqual(response.status_code, 200) - self.assertIn('1 matching package found', response.content) + self.assertIn('1 matching package found', response.content.decode()) def test_filter_name(self): response = self.client.get('/packages/?name=name') self.assertEqual(response.status_code, 200) - self.assertIn('0 matching packages found', response.content) + self.assertIn('0 matching packages found', response.content.decode()) def test_filter_repo(self): response = self.client.get('/packages/?repo=Core') self.assertEqual(response.status_code, 200) - self.assertIn('5 matching packages found', response.content) + self.assertIn('5 matching packages found', response.content.decode()) def test_filter_desc(self): response = self.client.get('/packages/?desc=kernel') self.assertEqual(response.status_code, 200) - self.assertIn('1 matching package found', response.content) + self.assertIn('1 matching package found', response.content.decode()) def test_filter_flagged(self): response = self.client.get('/packages/?flagged=Flagged') self.assertEqual(response.status_code, 200) - self.assertIn('0 matching packages found', response.content) + self.assertIn('0 matching packages found', response.content.decode()) def test_filter_not_flagged(self): response = self.client.get('/packages/?flagged=Not Flagged') self.assertEqual(response.status_code, 200) - self.assertIn('5 matching packages found', response.content) + self.assertIn('5 matching packages found', response.content.decode()) def test_filter_arch(self): response = self.client.get('/packages/?arch=any') self.assertEqual(response.status_code, 200) - self.assertIn('0 matching packages found', response.content) + self.assertIn('0 matching packages found', response.content.decode()) def test_filter_maintainer_orphan(self): response = self.client.get('/packages/?maintainer=orphan') self.assertEqual(response.status_code, 200) - self.assertIn('5 matching packages found', response.content) + self.assertIn('5 matching packages found', response.content.decode()) def test_filter_packager_unknown(self): response = self.client.get('/packages/?packager=unknown') self.assertEqual(response.status_code, 200) - self.assertIn('5 matching packages found', response.content) + self.assertIn('5 matching packages found', response.content.decode()) def test_sort(self): response = self.client.get('/packages/?sort=pkgname') @@ -188,7 +188,7 @@ def test_packages(self): def test_packages_suggest(self): response = self.client.get('/opensearch/packages/suggest?q=linux') self.assertEqual(response.status_code, 200) - self.assertIn('linux', response.content) + self.assertIn('linux', response.content.decode()) response = self.client.get('/opensearch/packages/suggest') @@ -271,7 +271,7 @@ def test_flag_package(self): data, follow=True) self.assertEqual(response.status_code, 200) - self.assertIn('Package Flagged - linux', response.content) + self.assertIn('Package Flagged - linux', response.content.decode()) self.assertEqual(len(mail.outbox), 1) self.assertIn('package [linux] marked out-of-date', mail.outbox[0].subject) @@ -280,7 +280,7 @@ def test_flag_package(self): data, follow=True) self.assertEqual(response.status_code, 200) - self.assertIn('has already been flagged out-of-date.', response.content) + self.assertIn('has already been flagged out-of-date.', response.content.decode()) def test_flag_package_invalid(self): data = { @@ -292,7 +292,7 @@ def test_flag_package_invalid(self): data, follow=True) self.assertEqual(response.status_code, 200) - self.assertIn('Enter a valid and useful out-of-date message', response.content) + self.assertIn('Enter a valid and useful out-of-date message', response.content.decode()) self.assertEqual(len(mail.outbox), 0)