This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository paleomix.
commit 392d73f2bed65efe8a6e3da5a70ec97ab74cedae Author: Andreas Tille <[email protected]> Date: Thu Nov 16 09:38:37 2017 +0100 Drop patches replaced by upstream code --- debian/patches/fix_makefile_test.patch | 39 ---------------------------- debian/patches/series | 2 -- debian/patches/work_around_os.getlogin.patch | 35 ------------------------- 3 files changed, 76 deletions(-) diff --git a/debian/patches/fix_makefile_test.patch b/debian/patches/fix_makefile_test.patch deleted file mode 100644 index 5e58f37..0000000 --- a/debian/patches/fix_makefile_test.patch +++ /dev/null @@ -1,39 +0,0 @@ -Author: Andreas Tille <[email protected]> -Last-Update: Tue, 14 Feb 2017 12:04:19 +0100 -Description: That's really strange: At package build time this patch - seems to be really needed to prevent the faulure below. However, when running - the test on the installed package it fails with this change. So it is not - applied as quilt patch but rather using sed in d/rules to enable proper build - while not affecting other testing. I suspect that has something to do with - improperly set time zone in pbuilder. - . - . - ====================================================================== - FAIL: common_tests.makefile_test.test_read_makefile__missing_simple_file - ---------------------------------------------------------------------- - Traceback (most recent call last): - File "/usr/lib/python2.7/dist-packages/nose/case.py", line 197, in runTest - self.test(*self.arg) - File "/build/paleomix-1.2.7/.pybuild/pythonX.Y_2.7/build/tests/common_tests/makefile_test.py", line 1650, in test_read_makefile__missing_simple_file - assert_equal(expected, result) - AssertionError: {'Statistics': {'MTime': '2005-07-07 08:50:00', 'Hash': '563a2052b67dcde9f193fbe [truncated]... != {'Statistics': {'MTime': '2005-07-07 06:50:00', 'Hash': '563a2052b67dcde9f193fbe [truncated]... - {'Makefile': {'Defaults': {'First': 0.0001, 'Second': 'a string'}}, - 'Statistics': {'Filename': '/build/paleomix-1.2.7/.pybuild/pythonX.Y_2.7/build/tests/data/simple.yaml', - 'Hash': '563a2052b67dcde9f193fbe8d51fa2b6f0806505', - - 'MTime': '2005-07-07 08:50:00'}} - ? ^ - - + 'MTime': '2005-07-07 06:50:00'}} - ? ^ - ---- a/tests/common_tests/makefile_test.py -+++ b/tests/common_tests/makefile_test.py -@@ -1643,7 +1643,7 @@ def test_read_makefile__missing_simple_f - "Statistics": { - "Filename": test_file("simple.yaml"), - "Hash": "563a2052b67dcde9f193fbe8d51fa2b6f0806505", -- "MTime": "2005-07-07 08:50:00", -+ "MTime": "2005-07-07 06:50:00", - } - } - result = read_makefile(test_file("simple.yaml"), specs) diff --git a/debian/patches/series b/debian/patches/series index 7d0c691..c731c77 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ avoid_downloading_prerequisites.patch -## fix_makefile_test.patch ## rather use sed in d/rules (see patch description) -work_around_os.getlogin.patch avoid_privacy_breach.patch diff --git a/debian/patches/work_around_os.getlogin.patch b/debian/patches/work_around_os.getlogin.patch deleted file mode 100644 index 34378b8..0000000 --- a/debian/patches/work_around_os.getlogin.patch +++ /dev/null @@ -1,35 +0,0 @@ -Author: Andreas Tille <[email protected]> -Last-Update: Tue, 14 Feb 2017 12:04:19 +0100 -Description: Avoid test failures - ====================================================================== - ERROR: Failure: OSError ([Errno 25] Inappropriate ioctl for device) - ---------------------------------------------------------------------- - Traceback (most recent call last): - File "/usr/lib/python2.7/dist-packages/nose/loader.py", line 418, in loadTestsFromName - addr.filename, addr.module) - File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 47, in importFromPath - return self.importFromDir(dir_path, fqname) - File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 94, in importFromDir - mod = load_module(part_fqname, fh, filename, desc) - File "/build/paleomix-1.2.7/.pybuild/pythonX.Y_2.7/build/tests/atomiccmd_test/command_test.py", line 164, in <module> - @with_temp_folder - File "paleomix/common/testing.py", line 49, in with_temp_folder - temp_root = os.path.join(tempfile.gettempdir(), os.getlogin()) - OSError: [Errno 25] Inappropriate ioctl for device - ---- a/paleomix/common/testing.py -+++ b/paleomix/common/testing.py -@@ -46,7 +46,12 @@ def with_temp_folder(func): - Creates a unique temporary folder before running 'func'. The - function is is assumed to take at least one parameter, the first - of which is assumed to represent the temporary folder.""" -- temp_root = os.path.join(tempfile.gettempdir(), os.getlogin()) -+ try: -+ os_getlogin=os.getlogin() -+ except OSError: # see https://stackoverflow.com/questions/3100750/running-command-in-background -+ import pwd -+ os_getlogin=pwd.getpwuid(os.getuid()).pw_name -+ temp_root = os.path.join(tempfile.gettempdir(), os_getlogin) - make_dirs(temp_root) # Ensure that this subdirectory exists - - @nose.tools.istest -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/paleomix.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
