From 12a49e2cd4d8c8328d238e4b128e51b240077b11 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 4 Aug 2018 00:26:49 +0300
Subject: [PATCH 1/2] bpo-26818: Add a test to make sure the bug is fixed

The main cause of this bug was fixed as part of bpo-31908.
---
 Lib/test/test_trace.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
index 55a8bcea3e546ad..0e0c48f232a967c 100644
--- a/Lib/test/test_trace.py
+++ b/Lib/test/test_trace.py
@@ -438,5 +438,27 @@ def test_sys_argv_list(self):
         status, trace_stdout, stderr = assert_python_ok('-m', 'trace', '-l', TESTFN)
         self.assertIn(direct_stdout.strip(), trace_stdout)
 
+    def test_count_and_summary(self):
+        filename = TESTFN + '.py'
+        coverfilename = TESTFN + '.cover'
+        with open(filename, 'w') as fd:
+            self.addCleanup(unlink, filename)
+            self.addCleanup(unlink, coverfilename)
+            fd.write(textwrap.dedent("""\
+                x = 1
+                y = 2
+
+                def f():
+                    return x + y
+
+                for i in range(10):
+                    f()
+            """))
+        status, stdout, _ = assert_python_ok('-m', 'trace', '-cs', filename)
+        stdout = stdout.decode()
+        self.assertEqual(status, 0)
+        self.assertIn('lines   cov%   module   (path)', stdout)
+        self.assertIn(f'6   100%   {TESTFN}   ({filename})', stdout)
+
 if __name__ == '__main__':
     unittest.main()

From 470267de31a76e5316de1b9408f69ef7b9fbd248 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 11 Aug 2018 08:53:06 +0300
Subject: [PATCH 2/2] use f-strings

---
 Lib/test/test_trace.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
index 0e0c48f232a967c..dc9b3fa7b6af8c3 100644
--- a/Lib/test/test_trace.py
+++ b/Lib/test/test_trace.py
@@ -439,8 +439,8 @@ def test_sys_argv_list(self):
         self.assertIn(direct_stdout.strip(), trace_stdout)
 
     def test_count_and_summary(self):
-        filename = TESTFN + '.py'
-        coverfilename = TESTFN + '.cover'
+        filename = f'{TESTFN}.py'
+        coverfilename = f'{TESTFN}.cover'
         with open(filename, 'w') as fd:
             self.addCleanup(unlink, filename)
             self.addCleanup(unlink, coverfilename)