From 4c5bc7515e864a0b5d2d8c1a0a7016857f5ae4c7 Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Wed, 28 Jun 2017 16:55:09 +1000 Subject: [PATCH] Remove ResourceWarnings under Py3 This is just a matter of correctly closing files we open. Signed-off-by: Daniel Axtens Reviewed-by: Andrew Donnellan Reviewed-by: Stephen Finucane --- patchwork/management/commands/parsearchive.py | 1 + patchwork/tests/test_management.py | 2 ++ patchwork/tests/test_series.py | 10 +++++++++- patchwork/tests/utils.py | 4 +++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/patchwork/management/commands/parsearchive.py b/patchwork/management/commands/parsearchive.py index a3c83601..4e102a98 100644 --- a/patchwork/management/commands/parsearchive.py +++ b/patchwork/management/commands/parsearchive.py @@ -114,3 +114,4 @@ class Command(BaseCommand): 'errors': errors, 'new': count - duplicates - dropped - errors, }) + mbox.close() diff --git a/patchwork/tests/test_management.py b/patchwork/tests/test_management.py index f9166739..f548fce3 100644 --- a/patchwork/tests/test_management.py +++ b/patchwork/tests/test_management.py @@ -52,6 +52,7 @@ class ParsemailTest(TestCase): with self.assertRaises(SystemExit) as exc: call_command('parsemail', infile=None) + sys.stdin.close() self.assertEqual(exc.exception.code, 1) def test_valid_path(self): @@ -78,6 +79,7 @@ class ParsemailTest(TestCase): call_command('parsemail', infile=None, list_id=project.listid) + sys.stdin.close() self.assertEqual(exc.exception.code, 0) count = models.Patch.objects.filter(project=project.id).count() diff --git a/patchwork/tests/test_series.py b/patchwork/tests/test_series.py index 17a8c732..e26dd3ee 100644 --- a/patchwork/tests/test_series.py +++ b/patchwork/tests/test_series.py @@ -54,6 +54,7 @@ class _BaseTestCase(TestCase): results[1].append(obj) else: results[2].append(obj) + mbox.close() self.assertParsed(results, counts) @@ -273,7 +274,6 @@ class BaseSeriesTest(_BaseTestCase): self.assertSerialized(covers, [1]) - class RevisedSeriesTest(_BaseTestCase): """Tests for a series plus a single revision. @@ -665,6 +665,8 @@ class SeriesNameTestCase(TestCase): self._parse_mail(mbox[2]) self.assertEqual(cover.latest_series.name, cover_name) + mbox.close() + def test_no_cover_letter(self): """Series without a cover letter. @@ -685,6 +687,8 @@ class SeriesNameTestCase(TestCase): self._parse_mail(mbox[1]) self.assertEqual(series.name, patch.name) + mbox.close() + def test_out_of_order(self): """Series received out of order. @@ -709,6 +713,8 @@ class SeriesNameTestCase(TestCase): cover = self._parse_mail(mbox[2]) self.assertEqual(cover.latest_series.name, self._format_name(cover)) + mbox.close() + def test_custom_name(self): """Series with custom name. @@ -737,3 +743,5 @@ class SeriesNameTestCase(TestCase): self._parse_mail(mbox[2]) self.assertEqual(series.name, series_name) + + mbox.close() diff --git a/patchwork/tests/utils.py b/patchwork/tests/utils.py index 3d0293ca..d4005c77 100644 --- a/patchwork/tests/utils.py +++ b/patchwork/tests/utils.py @@ -54,7 +54,9 @@ def read_patch(filename, encoding=None): else: f = open(file_path) - return f.read() + result = f.read() + f.close() + return result error_strings = { -- 2.47.3