[Python-modules-commits] [python-macholib] 05/08: merge patched into master

[IOhannes m zmölnig]

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

umlaeute pushed a commit to annotated tag debian/1.7_dfsg-3
in repository python-macholib.

commit 8b56912c6692da92a3324e60181944c2bb970218
Merge: ec49a59 5b24e4a
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Oct 26 22:46:19 2015 +0100

    merge patched into master

 debian/.git-dpm                                        |  4 ++--
 .../0001-Skip-tests-that-can-only-work-on-OSX.patch    | 18 +++++++++++++-----
 macholib_tests/test_command_line.py                    |  1 +
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 77c4be8,0000000..867ca39
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 1d1739c749c07fa355a675b2c294879f268f70bf
- 1d1739c749c07fa355a675b2c294879f268f70bf
++5b24e4a91b6c525b72c1395f9c952e25663a6e44
++5b24e4a91b6c525b72c1395f9c952e25663a6e44
 +e523d84f6a5f1a3950bd5e442ba13875a6e76c20
 +e523d84f6a5f1a3950bd5e442ba13875a6e76c20
 +python-macholib_1.7~dfsg.orig.tar.gz
 +8b83fda52ecc9efa5f79038f204e4e777acebbf3
 +51707
diff --cc debian/patches/0001-Skip-tests-that-can-only-work-on-OSX.patch
index caaec45,0000000..da0dd47
mode 100644,000000..100644
--- a/debian/patches/0001-Skip-tests-that-can-only-work-on-OSX.patch
+++ b/debian/patches/0001-Skip-tests-that-can-only-work-on-OSX.patch
@@@ -1,59 -1,0 +1,67 @@@
- From 1d1739c749c07fa355a675b2c294879f268f70bf Mon Sep 17 00:00:00 2001
++From 5b24e4a91b6c525b72c1395f9c952e25663a6e44 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
 + <zmoelnig at umlautQ.umlaeute.mur.at>
 +Date: Mon, 26 Oct 2015 22:41:24 +0100
 +Subject: Skip tests that can only work on OSX
 +
 +---
-  macholib_tests/test_command_line.py | 2 ++
++ macholib_tests/test_command_line.py | 3 +++
 + macholib_tests/test_dyld.py         | 3 +++
-  2 files changed, 5 insertions(+)
++ 2 files changed, 6 insertions(+)
 +
 +diff --git a/macholib_tests/test_command_line.py b/macholib_tests/test_command_line.py
- index a9cfd6f..ad77de8 100644
++index a9cfd6f..debb99b 100644
 +--- a/macholib_tests/test_command_line.py
 ++++ b/macholib_tests/test_command_line.py
 +@@ -24,6 +24,7 @@ class TestCmdLine (unittest.TestCase):
 +         self.assertTrue(macho_dump.main is _cmdline.main)
 +         self.assertTrue(macho_find.main is _cmdline.main)
 + 
 ++    @unittest.skipUnless("darwin" == sys.platform, """'/bin/sh' is only a MachO-file on OSX""")
 +     def test_check_file(self):
 +         record = []
 +         def record_cb(fp, path):
- @@ -115,6 +116,7 @@ class TestCmdLine (unittest.TestCase):
++@@ -60,6 +61,7 @@ class TestCmdLine (unittest.TestCase):
++             if os.path.exists('test.exec'):
++                 os.unlink('test.exec')
++ 
+++    @unittest.skipUnless("darwin" == sys.platform, """'/bin/sh' is only a MachO-file on OSX""")
++     def test_shared_main(self):
++ 
++         saved_stderr = sys.stderr
++@@ -115,6 +117,7 @@ class TestCmdLine (unittest.TestCase):
 +         macho_find.print_file(fp, "file2")
 +         self.assertEqual(fp.getvalue(), "file1\nfile2\n")
 + 
 ++    @unittest.skipUnless("darwin" == sys.platform, """'/bin/sh' is only a MachO-file on OSX""")
 +     def test_macho_dump(self):
 +         fp = StringIO()
 +         macho_dump.print_file(fp, "/bin/sh")
 +diff --git a/macholib_tests/test_dyld.py b/macholib_tests/test_dyld.py
 +index 7b41758..6ed6cc2 100644
 +--- a/macholib_tests/test_dyld.py
 ++++ b/macholib_tests/test_dyld.py
 +@@ -332,6 +332,7 @@ class TestDyld (unittest.TestCase):
 +                     '/network/lib/Python',
 +                 ])
 + 
 ++    @unittest.skipUnless("darwin" == sys.platform, """'/usr/lib/libSystem.dylib' only exists on OSX""")
 +     def test_dyld_find(self):
 +         result = dyld.dyld_find('/usr/lib/libSystem.dylib')
 +         self.assertEqual(result, '/usr/lib/libSystem.dylib')
 +@@ -387,6 +388,7 @@ class TestDyld (unittest.TestCase):
 +         finally:
 +             patcher.cleanup()
 + 
 ++    @unittest.skipUnless("darwin" == sys.platform, """'/System/Library/Framworks/Cocoa.framework' only exists on OSX""")
 +     def test_framework_find(self):
 +         result = dyld.framework_find('/System/Library/Frameworks/Cocoa.framework/Versions/Current/Cocoa')
 +         self.assertEqual(result, '/System/Library/Frameworks/Cocoa.framework/Versions/Current/Cocoa')
 +@@ -442,6 +444,7 @@ class TestDyld (unittest.TestCase):
 + 
 + class TestTrivialDyld (unittest.TestCase):
 +     # Tests ported from the implementation file
 ++    @unittest.skipUnless("darwin" == sys.platform, """'libSystem.dylib'/'System.framework' only exist on OSX""")
 +     def testBasic(self):
 +         self.assertEqual(dyld.dyld_find('libSystem.dylib'), '/usr/lib/libSystem.dylib')
 +         self.assertEqual(dyld.dyld_find('System.framework/System'), '/System/Library/Frameworks/System.framework/System')

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