Selaa lähdekoodia

Drop patch applied upstream.

Jelmer Vernooij 12 vuotta sitten
vanhempi
commit
f7d4b1d59c
3 muutettua tiedostoa jossa 1 lisäystä ja 80 poistoa
  1. 1 0
      debian/changelog
  2. 0 79
      debian/patches/01_less_strict_index_tests
  3. 0 1
      debian/patches/series

+ 1 - 0
debian/changelog

@@ -1,6 +1,7 @@
 dulwich (0.8.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
+   + Drop 01_less_strict_index_tests: applied upstream.
   * Migrate to Git; replace Vcs-Bzr header with Vcs-Git header.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Fri, 09 Nov 2012 23:44:30 +0100

+ 0 - 79
debian/patches/01_less_strict_index_tests

@@ -1,79 +0,0 @@
-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
-

+ 0 - 1
debian/patches/series

@@ -1 +0,0 @@
-01_less_strict_index_tests