[reprotest] 01/01: Tweak tests to avoid some build dependencies
Ximin Luo
infinity0 at debian.org
Thu Oct 26 23:09:43 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository reprotest.
commit 9a1b7ab37c53dc2a9384fcc1ef01a0c2028ff8d3
Author: Ximin Luo <infinity0 at debian.org>
Date: Fri Oct 27 01:09:13 2017 +0200
Tweak tests to avoid some build dependencies
- python3-pip is no longer pulled in automatically, drop the bdist_wheel test
- use dpkg-buildpackage to avoid a dependency on devscripts
---
README-dev.rst | 2 +-
README.rst | 6 +++---
debian/control | 3 +--
tests/test_reprotest.py | 5 ++---
tox.ini | 2 +-
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/README-dev.rst b/README-dev.rst
index 8189b36..5a145d0 100644
--- a/README-dev.rst
+++ b/README-dev.rst
@@ -48,7 +48,7 @@ For the host system and the two containers, run:
(Additionally for mk-sbuild stable, enable the backports repository.)
(Additionally for chroot, run:
$ mknod -m 666 /dev/fuse c 10 229)
- $ apt-get install python3 python3-pip
+ $ apt-get install python3
$ apt-get install locales-all
Now, finally run the tests:
diff --git a/README.rst b/README.rst
index baff2d1..a047aaa 100644
--- a/README.rst
+++ b/README.rst
@@ -32,7 +32,7 @@ These two invocations are equivalent; you can pick the most convenient one
for your use-case. When using these from a shell:
* If the build command has spaces, you will need to quote them, e.g.
- ``reprotest "debuild -b -uc -us" [..]``.
+ ``reprotest "dpkg-buildpackage -b --no-sign" [..]``.
* If you want to use several build artifact patterns, or if you want to
use shell wildcards as a pattern, you will also need to quote them, e.g.
@@ -54,8 +54,8 @@ Running in a virtual server
You can also run the build inside what is called a "virtual server".
This could be a container, a chroot, etc. You run them like this::
- $ reprotest 'python3 setup.py bdist_wheel' 'dist/*.whl' -- qemu /path/to/qemu.img
- $ reprotest 'debuild -b -uc -us' '../*.deb' -- schroot unstable-amd64
+ $ reprotest 'python3 setup.py bdist_wheel' 'dist/*.whl' -- qemu /path/to/qemu.img
+ $ reprotest 'dpkg-buildpackage -b --no-sign' '../*.deb' -- schroot unstable-amd64
There are different server types available. See ``--help`` for a list of
them, which appears near the top, in the "virtual\_server\_args" part of
diff --git a/debian/control b/debian/control
index 4c5fb33..0c732a3 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Build-Depends: debhelper (>= 10),
python3-setuptools,
help2man <!nodoc>,
python3-docutils <!nodoc>,
-# tests.py uses debuild from devscripts, which itself uses lintian
- devscripts <!nocheck>,
+# tests.py uses dpkg-buildpackage which uses lintian
diffoscope <!nocheck>,
faketime <!nocheck>,
lintian <!nocheck>,
diff --git a/tests/test_reprotest.py b/tests/test_reprotest.py
index 19aff73..b631259 100644
--- a/tests/test_reprotest.py
+++ b/tests/test_reprotest.py
@@ -69,8 +69,7 @@ def test_self_build(virtual_server):
# figure out which version of setuptools made things reproduce and add a
# versioned dependency on that one
assert(1 == subprocess.call(REPROTEST + ['python3 setup.py bdist', 'dist/*.tar.gz'] + virtual_server))
- assert(1 == subprocess.call(REPROTEST + ['python3 setup.py sdist; sleep 2', 'dist/*.tar.gz'] + virtual_server))
- assert(1 == subprocess.call(REPROTEST + ['python3 setup.py bdist_wheel', 'dist/*.whl'] + virtual_server))
+ assert(1 == subprocess.call(REPROTEST + ['python3 setup.py sdist', 'dist/*.tar.gz'] + virtual_server))
def test_command_lines():
test_args, _, _ = check_command_line(".".split(), 0)
@@ -108,6 +107,6 @@ def test_debian_build(virtual_server):
# gets written twice and the second one is the "real" one, but since it
# should all be reproducible, this should be OK.
assert(0 == subprocess.call(
- REPROTEST + ['debuild -b -nc -uc -us', '../*.deb'] + virtual_server,
+ REPROTEST + ['dpkg-buildpackage -b -nc --no-sign', '../*.deb'] + virtual_server,
# "nocheck" to stop tests recursing into themselves
env=dict(list(os.environ.items()) + [("DEB_BUILD_OPTIONS", "nocheck")])))
diff --git a/tox.ini b/tox.ini
index 0362e07..06da613 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
# envlist = coverage-clean, py35, coverage-stats
-envlist = py35
+envlist = py36
skip_missing_interpreters = true
[testenv:coverage-clean]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reprotest.git
More information about the Reproducible-commits
mailing list