Handle windows path separators in tests

Author: sbidoul

testing/test_git.py

@@ -3,6 +3,7 @@
 from setuptools_scm import git
 import pytest
 from datetime import date
+from os.path import join as opj
 
 
 @pytest.fixture
@@ -124,7 +125,7 @@ def test_git_archive_export_ignore(wd):
     wd('git add test1.txt test2.txt')
     wd.commit()
     with wd.cwd.as_cwd():
-        assert integration.find_files('.') == ['./test1.txt']
+        assert integration.find_files('.') == [opj('.', 'test1.txt')]
 
 
 @pytest.mark.issue(228)
@@ -134,7 +135,7 @@ def test_git_archive_subdirectory(wd):
     wd('git add foobar')
     wd.commit()
     with wd.cwd.as_cwd():
-        assert integration.find_files('.') == ['./foobar/test1.txt']
+        assert integration.find_files('.') == [opj('.', 'foobar', 'test1.txt')]
 
 
 def test_git_feature_branch_increments_major(wd):

testing/test_git_file_finder.py

@@ -23,65 +23,72 @@ def inwd(wd):
         yield wd
 
 
+def _sep(paths):
+    return {
+        path.replace('/', os.path.sep)
+        for path in paths
+    }
+
+
 def test_basic(inwd):
-    assert set(find_files()) == {
+    assert set(find_files()) == _sep({
         'file1',
         'adir/filea',
         'bdir/fileb',
-    }
-    assert set(find_files('.')) == {
+    })
+    assert set(find_files('.')) == _sep({
         './file1',
         './adir/filea',
         './bdir/fileb',
-    }
-    assert set(find_files('adir')) == {
+    })
+    assert set(find_files('adir')) == _sep({
         'adir/filea',
-    }
+    })
 
 
 def test_case(inwd):
     (inwd.cwd / 'CamelFile').ensure(file=True)
     (inwd.cwd / 'file2').ensure(file=True)
     inwd.add_and_commit()
-    assert set(find_files()) == {
+    assert set(find_files()) == _sep({
         'CamelFile',
         'file2',
         'file1',
         'adir/filea',
         'bdir/fileb',
-    }
+    })
 
 
 @pytest.mark.skipif(sys.platform == 'win32',
                     reason="symlinks to dir not supported")
 def test_symlink_dir(inwd):
     (inwd.cwd / 'adir' / 'bdirlink').mksymlinkto('../bdir')
     inwd.add_and_commit()
-    assert set(find_files('adir')) == {
+    assert set(find_files('adir')) == _sep({
         'adir/filea',
         'adir/bdirlink/fileb',
-    }
+    })
 
 
 @pytest.mark.skipif(sys.platform == 'win32',
                     reason="symlinks to files not supported on windows")
 def test_symlink_file(inwd):
     (inwd.cwd / 'adir' / 'file1link').mksymlinkto('../file1')
     inwd.add_and_commit()
-    assert set(find_files('adir')) == {
+    assert set(find_files('adir')) == _sep({
         'adir/filea',
         'adir/file1link',
-    }
+    })
 
 
 @pytest.mark.skipif(sys.platform == 'win32',
                     reason="symlinks to dir not supported")
 def test_symlink_loop(inwd):
     (inwd.cwd / 'adir' / 'loop').mksymlinkto('../adir')
     inwd.add_and_commit()
-    assert set(find_files('adir')) == {
+    assert set(find_files('adir')) == _sep({
         'adir/filea',
-    }
+    })
 
 
 @pytest.mark.skipif(sys.platform == 'win32',
@@ -90,37 +97,37 @@ def test_symlink_dir_out_of_git(inwd):
     (inwd.cwd / 'adir' / 'outsidedirlink').\
         mksymlinkto(os.path.join(__file__, '..'))
     inwd.add_and_commit()
-    assert set(find_files('adir')) == {
+    assert set(find_files('adir')) == _sep({
         'adir/filea',
-    }
+    })
 
 
 @pytest.mark.skipif(sys.platform == 'win32',
                     reason="symlinks to files not supported on windows")
 def test_symlink_file_out_of_git(inwd):
     (inwd.cwd / 'adir' / 'outsidefilelink').mksymlinkto(__file__)
     inwd.add_and_commit()
-    assert set(find_files('adir')) == {
+    assert set(find_files('adir')) == _sep({
         'adir/filea',
-    }
+    })
 
 
 def test_empty_root(inwd):
     subdir = inwd.cwd / 'cdir' / 'subdir'
     subdir.ensure(dir=True)
     (subdir / 'filec').ensure(file=True)
     inwd.add_and_commit()
-    assert set(find_files('cdir')) == {
+    assert set(find_files('cdir')) == _sep({
         'cdir/subdir/filec',
-    }
+    })
 
 
 def test_empty_subdir(inwd):
     subdir = inwd.cwd / 'adir' / 'emptysubdir' / 'subdir'
     subdir.ensure(dir=True)
     (subdir / 'xfile').ensure(file=True)
     inwd.add_and_commit()
-    assert set(find_files('adir')) == {
+    assert set(find_files('adir')) == _sep({
         'adir/filea',
         'adir/emptysubdir/subdir/xfile',
-    }
+    })