| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879 |
- Description: Make index entry tests a little bit less strict, to cope with
- slightly different behaviour on various platforms.
- Origin: commit, revision id: git-v1:c398d692d1ba6c5fcee26383bfc78f73875de20b
- Author: Jelmer Vernooij <jelmer@samba.org>
- Last-Update: 2012-04-02
- Applied-Upstream: merged in revision 1044
- X-Bzr-Revision-Id: git-v1:c398d692d1ba6c5fcee26383bfc78f73875de20b
- === modified file 'dulwich/tests/test_index.py'
- --- old/dulwich/tests/test_index.py 2012-03-29 00:21:54 +0000
- +++ new/dulwich/tests/test_index.py 2012-04-02 11:05:18 +0000
- @@ -26,7 +26,6 @@
- import shutil
- import stat
- import struct
- -import sys
- import tempfile
-
- from dulwich.index import (
- @@ -216,15 +215,8 @@
-
- class BuildIndexTests(TestCase):
-
- - def assertReasonableIndexEntry(self, index_entry,
- - time, mode, filesize, sha):
- - delta = 1000000
- - self.assertEquals(index_entry[0], index_entry[1]) # ctime and atime
- - self.assertTrue(index_entry[0] > time - delta)
- + def assertReasonableIndexEntry(self, index_entry, mode, filesize, sha):
- self.assertEquals(index_entry[4], mode) # mode
- - if sys.platform != 'nt':
- - self.assertEquals(index_entry[5], os.getuid())
- - self.assertEquals(index_entry[6], os.getgid())
- self.assertEquals(index_entry[7], filesize) # filesize
- self.assertEquals(index_entry[8], sha) # sha
-
- @@ -283,8 +275,6 @@
- repo.object_store, tree.id)
-
- # Verify index entries
- - import time
- - ctime = time.time()
- index = repo.open_index()
- self.assertEquals(len(index), 4)
-
- @@ -292,28 +282,28 @@
- apath = os.path.join(repo.path, 'a')
- self.assertTrue(os.path.exists(apath))
- self.assertReasonableIndexEntry(index['a'],
- - ctime, stat.S_IFREG | 0644, 6, filea.id)
- + stat.S_IFREG | 0644, 6, filea.id)
- self.assertFileContents(apath, 'file a')
-
- # fileb
- bpath = os.path.join(repo.path, 'b')
- self.assertTrue(os.path.exists(bpath))
- self.assertReasonableIndexEntry(index['b'],
- - ctime, stat.S_IFREG | 0644, 6, fileb.id)
- + stat.S_IFREG | 0644, 6, fileb.id)
- self.assertFileContents(bpath, 'file b')
-
- # filed
- dpath = os.path.join(repo.path, 'c', 'd')
- self.assertTrue(os.path.exists(dpath))
- self.assertReasonableIndexEntry(index['c/d'],
- - ctime, stat.S_IFREG | 0644, 6, filed.id)
- + stat.S_IFREG | 0644, 6, filed.id)
- self.assertFileContents(dpath, 'file d')
-
- # symlink to d
- epath = os.path.join(repo.path, 'c', 'e')
- self.assertTrue(os.path.exists(epath))
- self.assertReasonableIndexEntry(index['c/e'],
- - ctime, stat.S_IFLNK, 1, filee.id)
- + stat.S_IFLNK, 1, filee.id)
- self.assertFileContents(epath, 'd', symlink=True)
-
- # Verify no extra files
|
