[Python-apps-commits] r10038 - in packages/mercurial/trunk/debian (9 files)

[vicho at users.alioth.debian.org]

    Date: Tuesday, October 1, 2013 @ 07:25:07
  Author: vicho
Revision: 10038

Add autopkgtest tests

Added:
  packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
  packages/mercurial/trunk/debian/tests/
  packages/mercurial/trunk/debian/tests/control
  packages/mercurial/trunk/debian/tests/hgsubversion
  packages/mercurial/trunk/debian/tests/mercurial-git
  packages/mercurial/trunk/debian/tests/testsuite
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/control
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2013-09-30 22:57:48 UTC (rev 10037)
+++ packages/mercurial/trunk/debian/changelog	2013-10-01 07:25:07 UTC (rev 10038)
@@ -1,6 +1,7 @@
 mercurial (2.7.1-3) UNRELEASED; urgency=low
 
   * Update breaks of mercurial-git to the current version (0.4.0-1)
+  * Add autopkgtest tests
 
  -- Javi Merino <vicho at debian.org>  Mon, 30 Sep 2013 23:57:00 +0100
 

Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control	2013-09-30 22:57:48 UTC (rev 10037)
+++ packages/mercurial/trunk/debian/control	2013-10-01 07:25:07 UTC (rev 10038)
@@ -18,6 +18,7 @@
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/mercurial/trunk/
 X-Python-Version: >= 2.4
+XS-Testsuite: autopkgtest
 
 Package: mercurial-common
 Architecture: all 

Added: packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch	2013-10-01 07:25:07 UTC (rev 10038)
@@ -0,0 +1,21 @@
+Author: Javi Merino <vicho at debian.org>
+Description: Don't rm /usr/bin/python when running the testsuite
+ mercurial tries to delete /usr/bin/python when running the testsuite
+ with "make tests TESTFLAGS=--with-hg=/usr/bin/hg".  If you're doing
+ it as a user, the testsuite fails because it can't remove it.
+ .
+ This fixes it at least in Debian.  I'm unsure about other systems.
+Bug: http://bz.selenic.com/show_bug.cgi?id=4045
+
+diff --git a/tests/run-tests.py b/tests/run-tests.py
+--- a/tests/run-tests.py
++++ b/tests/run-tests.py
+@@ -429,7 +429,7 @@ def usecorrectpython():
+              sys.executable)
+         mypython = os.path.join(BINDIR, pyexename)
+         try:
+-            if os.readlink(mypython) == sys.executable:
++            if (mypython == sys.executable) or (os.readlink(mypython) == sys.executable):
+                 return
+             os.unlink(mypython)
+         except OSError, err:

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2013-09-30 22:57:48 UTC (rev 10037)
+++ packages/mercurial/trunk/debian/patches/series	2013-10-01 07:25:07 UTC (rev 10038)
@@ -7,3 +7,4 @@
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
+for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch

Added: packages/mercurial/trunk/debian/tests/control
===================================================================
--- packages/mercurial/trunk/debian/tests/control	                        (rev 0)
+++ packages/mercurial/trunk/debian/tests/control	2013-10-01 07:25:07 UTC (rev 10038)
@@ -0,0 +1,8 @@
+Tests: testsuite
+Depends: @ python-subversion monotone cvs bzr tla darcs pyflakes
+
+Tests: hgsubversion
+Depends: @ hgsubversion
+
+Tests: mercurial-git
+Depends: @ mercurial-git git

Added: packages/mercurial/trunk/debian/tests/hgsubversion
===================================================================
--- packages/mercurial/trunk/debian/tests/hgsubversion	                        (rev 0)
+++ packages/mercurial/trunk/debian/tests/hgsubversion	2013-10-01 07:25:07 UTC (rev 10038)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec hg clone svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/


Property changes on: packages/mercurial/trunk/debian/tests/hgsubversion
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/mercurial/trunk/debian/tests/mercurial-git
===================================================================
--- packages/mercurial/trunk/debian/tests/mercurial-git	                        (rev 0)
+++ packages/mercurial/trunk/debian/tests/mercurial-git	2013-10-01 07:25:07 UTC (rev 10038)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+git init try
+cd try
+echo a >a
+git add a
+git commit -m a
+cd ..
+hg clone try try2


Property changes on: packages/mercurial/trunk/debian/tests/mercurial-git
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/mercurial/trunk/debian/tests/testsuite
===================================================================
--- packages/mercurial/trunk/debian/tests/testsuite	                        (rev 0)
+++ packages/mercurial/trunk/debian/tests/testsuite	2013-10-01 07:25:07 UTC (rev 10038)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec make tests TESTFLAGS="--with-hg=/usr/bin/hg"


Property changes on: packages/mercurial/trunk/debian/tests/testsuite
___________________________________________________________________
Added: svn:executable
   + *