Windows portability: use os.path.join() for expected subdirectory paths.
authorstevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Sat, 20 Sep 2008 01:05:46 +0000 (01:05 +0000)
committerstevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Sat, 20 Sep 2008 01:05:46 +0000 (01:05 +0000)
git-svn-id: http://scons.tigris.org/svn/scons/trunk@3439 fdb21ef1-2011-0410-befe-b5e4ea1792b1

src/engine/SCons/Node/FSTests.py

index ca854b2c3e78a3c5f993ecc05d521f67ec9a6caa..5fa936fbdc66a33ed2d864d1242fa28b84540bfa 100644 (file)
@@ -2402,7 +2402,12 @@ class GlobTestCase(_tempdirTestCase):
         # At least sometimes this should return out-of-order items
         # if Glob doesn't sort.
         g = self.fs.Glob('disk-sub/*', strings=True)
-        assert g == ['disk-sub/disk-ddd', 'disk-sub/disk-eee', 'disk-sub/disk-fff'], str(g) + " is not sorted, but should be!"
+        expect = [
+            os.path.join('disk-sub', 'disk-ddd'),
+            os.path.join('disk-sub', 'disk-eee'),
+            os.path.join('disk-sub', 'disk-fff'),
+        ]
+        assert g == expect, str(g) + " is not sorted, but should be!"
 
 
 class RepositoryTestCase(_tempdirTestCase):