[Python-modules-commits] [python-persistent] 15/15: Reorganize debian/tests.

Fri Jan 6 21:13:41 UTC 2017

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository python-persistent.

commit 4d3975297b4befbe28ef88513bdc0f20742f3895
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jan 6 16:08:21 2017 -0500

    Reorganize debian/tests.
    
    Review cleanup.
---
 debian/changelog      |  7 ++++++-
 debian/control        |  1 -
 debian/copyright      |  2 +-
 debian/rules          |  2 +-
 debian/tests/all      |  4 ----
 debian/tests/all-3    |  4 ----
 debian/tests/control  |  2 +-
 debian/tests/import-2 | 15 +++++++++++++++
 debian/tests/import-3 | 15 +++++++++++++++
 9 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72cc396..a6ee0c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ python-persistent (4.2.2-1) unstable; urgency=medium
 
   [ Barry Warsaw ]
   * Fix typo in the description of python3-persistent. Closes: #810544.
+  * Rework the autopkgtests:
+    - d/control: We don't need to specify Testsuite explicitly anymore.
+    - Rename debian/tests/* to something more descriptive and add explicit
+      import tests of the C extension submodules.
+  * d/rules: We shouldn't need to set http_proxy in override_dh_auto_build
+    since pybuild does that automatically now.
 
   [ Ondřej Nový ]
   * Fixed VCS URL (https)
@@ -14,7 +20,6 @@ python-persistent (4.2.2-1) unstable; urgency=medium
   * d/control:
     + Bump X-Python*-Version stanzas (support for 2.6 and 3.2 was dropped)
     + Update Standards-Version to 3.9.8 (no change needed).
-    + The XS- prefix is no longer necessary for Testsuite.
   * Do not ship the test suite.
   * New 'python-persistent-doc' package with Sphinx documentation.
   * d/copyright: update Copyright: year
diff --git a/debian/control b/debian/control
index e661845..8954f3b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ X-Python3-Version: >= 3.3
 Homepage: https://pypi.python.org/pypi/persistent/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-persistent.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-persistent.git
-Testsuite: autopkgtest
 
 Package: python-persistent
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 8781f5f..4604aa0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -53,7 +53,7 @@ License: Zope-2.1
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 2014-2016 Barry A. Warsaw
+Copyright: 2014-2017 Barry A. Warsaw
 License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 3,
diff --git a/debian/rules b/debian/rules
index fea235d..d86aefb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export PYBUILD_AFTER_INSTALL = cd {destdir}{install_dir}/persistent && \
 
 override_dh_auto_build:
 	dh_auto_build
-	PYTHONPATH=. http_proxy=http://127.0.0.1:9/ sphinx-build -qNE -b html docs build/html
+	PYTHONPATH=. sphinx-build -qNE -b html docs build/html
 
 override_dh_auto_clean:
 	dh_auto_clean
diff --git a/debian/tests/all b/debian/tests/all
deleted file mode 100644
index a3b57af..0000000
--- a/debian/tests/all
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/python
-
-import persistent
-print persistent
diff --git a/debian/tests/all-3 b/debian/tests/all-3
deleted file mode 100644
index b6a7325..0000000
--- a/debian/tests/all-3
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/python3
-
-import persistent
-print(persistent)
diff --git a/debian/tests/control b/debian/tests/control
index 6ab9deb..93e1376 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
-Tests: all all-3
+Tests: import-2 import-3
 Depends: @
diff --git a/debian/tests/import-2 b/debian/tests/import-2
new file mode 100644
index 0000000..3d2809a
--- /dev/null
+++ b/debian/tests/import-2
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+
+import persistent
+print persistent
+
+# Make sure the extension modules can be imported.
+
+import persistent._timestamp
+print persistent._timestamp
+
+import persistent.cPersistence
+print persistent.cPersistence
+
+import persistent.cPickleCache
+print persistent.cPickleCache
diff --git a/debian/tests/import-3 b/debian/tests/import-3
new file mode 100644
index 0000000..ec22626
--- /dev/null
+++ b/debian/tests/import-3
@@ -0,0 +1,15 @@
+#!/usr/bin/python3
+
+import persistent
+print(persistent)
+
+# Make sure the extension modules can be imported.
+
+import persistent._timestamp
+print(persistent._timestamp)
+
+import persistent.cPersistence
+print(persistent.cPersistence)
+
+import persistent.cPickleCache
+print(persistent.cPickleCache)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-persistent.git

