# HG changeset patch
# User dfraser
# Date 1216131850 0
# Node ID a0fa17e33348dd11bb45173e428a2bfec2da196c
# Parent  7e9a60417cb31154d75a155656cc57e27fc796e2
use os.path.join for all tests that check filenames with directories, so that we get the right path on Windows as well

diff --git a/bitten/build/tests/pythontools.py b/bitten/build/tests/pythontools.py
--- a/bitten/build/tests/pythontools.py
+++ b/bitten/build/tests/pythontools.py
@@ -75,7 +75,7 @@
         child = xml.children[0]
         self.assertEqual('coverage', child.name)
         self.assertEqual('test.module', child.attr['name'])
-        self.assertEqual('test/module.py', child.attr['file'])
+        self.assertEqual(os.path.join('test', 'module.py'), child.attr['file'])
         self.assertEqual(100, child.attr['percentage'])
         self.assertEqual(60, child.attr['lines'])
 
@@ -96,7 +96,7 @@
         child = xml.children[0]
         self.assertEqual('coverage', child.name)
         self.assertEqual('test.module', child.attr['name'])
-        self.assertEqual('test/module.py', child.attr['file'])
+        self.assertEqual(os.path.join('test', 'module.py'), child.attr['file'])
         self.assertEqual(100, child.attr['percentage'])
         self.assertEqual(60, child.attr['lines'])
 
@@ -117,7 +117,7 @@
         child = xml.children[0]
         self.assertEqual('coverage', child.name)
         self.assertEqual('test.module', child.attr['name'])
-        self.assertEqual('test/module.py', child.attr['file'])
+        self.assertEqual(os.path.join('test', 'module.py'), child.attr['file'])
         self.assertEqual(92, child.attr['percentage'])
         self.assertEqual(28, child.attr['lines'])
 
@@ -179,7 +179,7 @@
         child = xml.children[0]
         self.assertEqual('coverage', child.name)
         self.assertEqual('test.module', child.attr['name'])
-        self.assertEqual('test/module.py', child.attr['file'])
+        self.assertEqual(os.path.join('test', 'module.py'), child.attr['file'])
 
     def test_summary_with_relative_path(self):
         self.summary.write("""
@@ -197,7 +197,7 @@
         child = xml.children[0]
         self.assertEqual('coverage', child.name)
         self.assertEqual('test.module', child.attr['name'])
-        self.assertEqual('test/module.py', child.attr['file'])
+        self.assertEqual(os.path.join('test', 'module.py'), child.attr['file'])
 
 
 class FigleafTestCase(unittest.TestCase):
@@ -259,7 +259,7 @@
         child = xml.children[0]
         self.assertEqual('coverage', child.name)
         self.assertEqual('test.module', child.attr['name'])
-        self.assertEqual('test/module.py', child.attr['file'])
+        self.assertEqual(os.path.join('test', 'module.py'), child.attr['file'])
         self.assertEqual(75, child.attr['percentage'])
         self.assertEqual(4, child.attr['lines'])
         self.assertEqual('1 0 - 1 1', child.attr['line_hits'])
@@ -284,7 +284,7 @@
         child = xml.children[0]
         self.assertEqual('coverage', child.name)
         self.assertEqual('test.module', child.attr['name'])
-        self.assertEqual('test/module.py', child.attr['file'])
+        self.assertEqual(os.path.join('test', 'module.py'), child.attr['file'])
         self.assertEqual(0, child.attr['percentage'])
         self.assertEqual(5, child.attr['lines'])
 
@@ -325,7 +325,7 @@
         filenames = pythontools._normalize_filenames(
                             self.ctxt, [filename],
                             FileSet(self.ctxt.basedir, '**/*.py', None))
-        self.assertEqual(['test/module.py'], list(filenames))
+        self.assertEqual([os.path.join('test', 'module.py')], list(filenames))
 
 
 class UnittestTestCase(unittest.TestCase):