[med-svn] [Git][med-team/unicycler][master] Set $TERM in d/rules; delete skip_failing_tests.patch

[Liubov Chuprikova]

Liubov Chuprikova pushed to branch master at Debian Med / unicycler


Commits:
287c07f0 by Liubov Chuprikova at 2018-09-11T13:54:17Z
Set $TERM in d/rules; delete skip_failing_tests.patch

- - - - -


3 changed files:

- debian/patches/series
- − debian/patches/skip_failing_tests.patch
- debian/rules


Changes:

=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
 spades.patch
 # bowtie.patch 
 install_wo_extra_steps.patch
-skip_failing_tests.patch


=====================================
debian/patches/skip_failing_tests.patch deleted
=====================================
@@ -1,23 +0,0 @@
-Author: Liubov Chuprikova <chuprikovalv at gmail.com>
-Last-Update: Fri, 7 September 2018 18:54:54 +0200
-Description: Skip strangly failing tests for a while.
-
-
---- a/test/test_help_text.py
-+++ b/test/test_help_text.py
-@@ -37,6 +37,7 @@
-     def test_return_code(self):
-         self.assertEqual(self.return_code, 0)
- 
-+    @unittest.skip("stderr != 0 Need more investigation!")
-     def test_output(self):
-         self.assertTrue(len(self.stdout) > 0)
-         self.assertEqual(len(self.stderr), 0)
-@@ -94,6 +95,7 @@
-     def test_return_code(self):
-         self.assertEqual(self.return_code, 0)
- 
-+    @unittest.skip("stderr != 0 Need more investigation!")
-     def test_output(self):
-         self.assertTrue(len(self.stdout) > 0)
-         self.assertEqual(len(self.stderr), 0)


=====================================
debian/rules
=====================================
@@ -2,7 +2,13 @@
 
 # DH_VERBOSE := 1
 
-# NOTE: All build steps are described in setup.py:UnicyclerInstall
+
+# Build time tests are flaky
+export DH_BUILD_MAINT_OPTIONS=nocheck
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+include /usr/share/dpkg/default.mk
 
 # copy all nacessary data before testing and make clean after the testing
 export PYBUILD_BEFORE_TEST=cp -a unicycler-runner.py {build_dir}; \
@@ -12,13 +18,8 @@ export PYBUILD_AFTER_TEST=rm {build_dir}/unicycler-runner.py; \
 	rm -r {build_dir}/sample_data; \
 	rm -r {build_dir}/unicycler/__pycache__
 
-
-# Build time tests are flaky
-export DH_BUILD_MAINT_OPTIONS=nocheck
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-include /usr/share/dpkg/default.mk
+# Set $TEMR to a known value to avoid "tput: No value for $TERM and no -T specified"
+export TERM=linux
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild



View it on GitLab: https://salsa.debian.org/med-team/unicycler/commit/287c07f0396f2983476245141501c74dd55f8131

-- 
View it on GitLab: https://salsa.debian.org/med-team/unicycler/commit/287c07f0396f2983476245141501c74dd55f8131
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180911/ac35bd44/attachment-0001.html>