From 2d5a0928f1db9beca9e5339c31d8fca6240c49e0 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 24 Jan 2014 22:19:23 +0200
Subject: [PATCH] Issue #20384: Fix the test_tarfile test on Windows.

On Windows os.open() error message doesn't contain file name.
---
 Lib/test/test_tarfile.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index f22b908797d..57fc062cae5 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -239,7 +239,12 @@ class CommonReadTest(ReadTest):
     def test_non_existent_tarfile(self):
         # Test for issue11513: prevent non-existent gzipped tarfiles raising
         # multiple exceptions.
-        with self.assertRaisesRegex(FileNotFoundError, "xxx"):
+        test = 'xxx'
+        if sys.platform == 'win32' and '|' in self.mode:
+            # Issue #20384: On Windows os.open() error message doesn't
+            # contain file name.
+            text = ''
+        with self.assertRaisesRegex(FileNotFoundError, test):
             tarfile.open("xxx", self.mode)
 
     def test_null_tarfile(self):