changeset 498:17ad4028ba14

Reverted incorrect parts of r557 - the `os.path.join` is only needed when the filename passed through is generated by `_create_file`
author dfraser
date Wed, 16 Jul 2008 08:08:24 +0000
parents fe271f8a4e58
children 79a422aeae7e
files bitten/build/tests/pythontools.py
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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(os.path.join('test', 'module.py'), child.attr['file'])
+        self.assertEqual('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(os.path.join('test', 'module.py'), child.attr['file'])
+        self.assertEqual('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(os.path.join('test', 'module.py'), child.attr['file'])
+        self.assertEqual('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(os.path.join('test', 'module.py'), child.attr['file'])
+        self.assertEqual('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(os.path.join('test', 'module.py'), child.attr['file'])
+        self.assertEqual('test/module.py', child.attr['file'])
 
 
 class FigleafTestCase(unittest.TestCase):
@@ -325,7 +325,7 @@
         filenames = pythontools._normalize_filenames(
                             self.ctxt, [filename],
                             FileSet(self.ctxt.basedir, '**/*.py', None))
-        self.assertEqual([os.path.join('test', 'module.py')], list(filenames))
+        self.assertEqual(['test/module.py'], list(filenames))
 
 
 class UnittestTestCase(unittest.TestCase):
Copyright (C) 2012-2017 Edgewall Software