From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Fri, 5 Jun 2009 14:14:34 +0000 (+0000)
Subject: Fix unittest discovery tests for Windows. Issue 6199
X-Git-Tag: v2.7a1~1021
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d53d085ada3f33aeb0d45a69c323b8930583c7b4;p=thirdparty%2FPython%2Fcpython.git

Fix unittest discovery tests for Windows. Issue 6199
---

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index ecf31628e84b..4d66dc67261b 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -3537,7 +3537,9 @@ class TestDiscovery(TestCase):
 
         # We should have loaded tests from the test_directory package by calling load_tests
         # and directly from the test_directory2 package
-        self.assertEqual(suite, ['load_tests', '/foo/test_directory2 module tests'])
+        self.assertEqual(suite,
+                         ['load_tests',
+                          os.path.join('/foo', 'test_directory2') + ' module tests'])
         self.assertEqual(Module.paths, [os.path.join('/foo', 'test_directory'),
                                         os.path.join('/foo', 'test_directory2')])