From b9e248975f3190fee245b30313c2744bf836bb1c Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 17 Nov 2017 16:12:48 -0500 Subject: [1.11.x] Refs #28814 -- Fixed test_runner failure on Python 3.7. Due to https://bugs.python.org/issue30399. Backport of 9d1d3b2d2fe0bef995b024368088eeabbdf73629 from master --- tests/test_runner/test_parallel.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/test_runner/test_parallel.py b/tests/test_runner/test_parallel.py index b888dc62af..7dca22e43e 100644 --- a/tests/test_runner/test_parallel.py +++ b/tests/test_runner/test_parallel.py @@ -1,3 +1,4 @@ +import sys import unittest from django.test import SimpleTestCase @@ -83,7 +84,8 @@ class RemoteTestResultTest(SimpleTestCase): event = events[1] self.assertEqual(event[0], 'addSubTest') self.assertEqual(str(event[2]), 'dummy_test (test_runner.test_parallel.SampleFailingSubtest) (index=0)') - self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1',)") + trailing_comma = '' if sys.version_info >= (3, 7) else ',' + self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1'%s)" % trailing_comma) event = events[2] - self.assertEqual(repr(event[3][1]), "AssertionError('2 != 1',)") + self.assertEqual(repr(event[3][1]), "AssertionError('2 != 1'%s)" % trailing_comma) -- cgit v1.2.1