diff options
Diffstat (limited to 'test/git/test_index.py')
| -rw-r--r-- | test/git/test_index.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/test/git/test_index.py b/test/git/test_index.py index e9541232..1a543f82 100644 --- a/test/git/test_index.py +++ b/test/git/test_index.py @@ -42,7 +42,7 @@ class TestTree(TestBase): # write the data - it must match the original tmpfile = tempfile.mktemp() index_merge.write(tmpfile) - fp = open(tmpfile, 'r') + fp = open(tmpfile, 'rb') assert fp.read() == fixture("index_merge") fp.close() os.remove(tmpfile) @@ -164,14 +164,14 @@ class TestTree(TestBase): # reset the working copy as well to current head,to pull 'back' as well new_data = "will be reverted" file_path = os.path.join(rw_repo.git.git_dir, "CHANGES") - fp = open(file_path, "w") + fp = open(file_path, "wb") fp.write(new_data) fp.close() index.reset(rev_head_parent, working_tree=True) assert not index.diff(None) assert cur_branch == rw_repo.active_branch assert cur_commit == rw_repo.head.commit - fp = open(file_path) + fp = open(file_path,'rb') try: assert fp.read() != new_data finally: @@ -332,7 +332,8 @@ class TestTree(TestBase): # add fake symlink and assure it checks-our as symlink fake_symlink_relapath = "my_fake_symlink" - fake_symlink_path = self._make_file(fake_symlink_relapath, "/etc/that", rw_repo) + link_target = "/etc/that" + fake_symlink_path = self._make_file(fake_symlink_relapath, link_target, rw_repo) fake_entry = BaseIndexEntry((0120000, null_sha, 0, fake_symlink_relapath)) entries = index.reset(new_commit).add([fake_entry]) assert len(entries) == 1 and S_ISLNK(entries[0].mode) @@ -341,5 +342,12 @@ class TestTree(TestBase): assert not S_ISLNK(os.stat(fake_symlink_path)[ST_MODE]) os.remove(fake_symlink_path) index.checkout(fake_symlink_path) - assert S_ISLNK(os.lstat(fake_symlink_path)[ST_MODE]) + + # on windows we will never get symlinks + if os.name == 'nt': + # simlinks should contain the link as text ( which is what a + # symlink actually is ) + open(fake_symlink_path,'rb').read() == link_target + else: + assert S_ISLNK(os.lstat(fake_symlink_path)[ST_MODE]) |