[Python-apps-commits] r14309 - in packages/mercurial/trunk/debian (5 files)

[mithrandi at users.alioth.debian.org]

    Date: Saturday, August 12, 2017 @ 12:35:37
  Author: mithrandi
Revision: 14309

Fix or disable some failing tests (closes: #823056, #850234).

Added:
  packages/mercurial/trunk/debian/patches/for_upstream__normalize_ints.patch
  packages/mercurial/trunk/debian/patches/for_upstream__unhardcode_errno.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/mercurial.test_blacklist
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2017-08-11 12:23:56 UTC (rev 14308)
+++ packages/mercurial/trunk/debian/changelog	2017-08-12 12:35:37 UTC (rev 14309)
@@ -1,3 +1,9 @@
+mercurial (4.3.1-2) unstable; urgency=high
+
+  * Fix or disable some failing tests (closes: #823056, #850234).
+
+ -- Tristan Seligmann <mithrandi at debian.org>  Sat, 12 Aug 2017 14:34:47 +0200
+
 mercurial (4.3.1-1) unstable; urgency=high
 
   * Urgency high because of important security fixes.

Modified: packages/mercurial/trunk/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/trunk/debian/mercurial.test_blacklist	2017-08-11 12:23:56 UTC (rev 14308)
+++ packages/mercurial/trunk/debian/mercurial.test_blacklist	2017-08-12 12:35:37 UTC (rev 14309)
@@ -22,3 +22,7 @@
 # but these are disabled by default in unstable now, so none of the test
 # scenarios are possible to correctly construct.
 test-https.t
+
+# These tests are flaky, still need to investigate why:
+test-commandserver.t
+test-largefiles.t

Added: packages/mercurial/trunk/debian/patches/for_upstream__normalize_ints.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__normalize_ints.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/for_upstream__normalize_ints.patch	2017-08-12 12:35:37 UTC (rev 14309)
@@ -0,0 +1,19 @@
+Index: mercurial-4.3.1/tests/test-context.py
+===================================================================
+--- mercurial-4.3.1.orig/tests/test-context.py	2017-08-11 00:46:53.000000000 +0200
++++ mercurial-4.3.1/tests/test-context.py	2017-08-12 11:13:01.089138397 +0200
+@@ -24,11 +24,10 @@
+ repo[None].add(['foo'])
+ repo.commit(text='commit1', date="0 0")
+ 
++d = repo[None]['foo'].date()
+ if os.name == 'nt':
+-    d = repo[None]['foo'].date()
+-    print("workingfilectx.date = (%d, %d)" % (d[0], d[1]))
+-else:
+-    print("workingfilectx.date =", repo[None]['foo'].date())
++    d = d[:2]
++print("workingfilectx.date = (%d, %d)" % d)
+ 
+ # test memctx with non-ASCII commit message
+ 

Added: packages/mercurial/trunk/debian/patches/for_upstream__unhardcode_errno.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__unhardcode_errno.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/for_upstream__unhardcode_errno.patch	2017-08-12 12:35:37 UTC (rev 14309)
@@ -0,0 +1,26 @@
+Index: mercurial-4.3.1/tests/test-acl.t
+===================================================================
+--- mercurial-4.3.1.orig/tests/test-acl.t	2017-08-11 00:46:53.000000000 +0200
++++ mercurial-4.3.1/tests/test-acl.t	2017-08-12 10:28:19.003812499 +0200
+@@ -883,7 +883,7 @@
+   added 3 changesets with 3 changes to 3 files
+   calling hook pretxnchangegroup.acl: hgext.acl.hook
+   acl: checking access for user "barney"
+-  error: pretxnchangegroup.acl hook raised an exception: [Errno 2] No such file or directory: '../acl.config'
++  error: pretxnchangegroup.acl hook raised an exception: [Errno *] * (glob)
+   bundle2-input-part: total payload size 1553
+   bundle2-input-bundle: 3 parts total
+   transaction abort!
+Index: mercurial-4.3.1/tests/test-tags.t
+===================================================================
+--- mercurial-4.3.1.orig/tests/test-tags.t	2017-08-11 00:46:53.000000000 +0200
++++ mercurial-4.3.1/tests/test-tags.t	2017-08-12 10:28:36.104105534 +0200
+@@ -381,7 +381,7 @@
+ 
+   $ hg blackbox -l 6
+   1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags
+-  1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> couldn't write cache/hgtagsfnodes1: [Errno 13] Permission denied: '$TESTTMP/t2/.hg/cache/hgtagsfnodes1'
++  1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> couldn't write cache/hgtagsfnodes1: [Errno *] * (glob)
+   1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> 2/3 cache hits/lookups in * seconds (glob)
+   1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> writing .hg/cache/tags2-visible with 1 tags
+   1970/01/01 00:00:00 bob @b968051b5cf3f624b771779c6d5f84f1d4c3fb5d (5000)> tags exited 0 after * seconds (glob)

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2017-08-11 12:23:56 UTC (rev 14308)
+++ packages/mercurial/trunk/debian/patches/series	2017-08-12 12:35:37 UTC (rev 14309)
@@ -5,3 +5,5 @@
 deb_specific__disable_libdir_replacement.patch
 for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
 deb_specific__fix_fhs_paths.patch
+for_upstream__unhardcode_errno.patch
+for_upstream__normalize_ints.patch