<pre style='margin:0'>
Cyril Roelandt (Steap) pushed a commit to branch master
in repository upt-macports.
</pre>
<p><a href="https://github.com/macports/upt-macports/commit/32773a5fa92892cae7b51ecc9a9f3f7bee649a77">https://github.com/macports/upt-macports/commit/32773a5fa92892cae7b51ecc9a9f3f7bee649a77</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 32773a5 Fix tests broken by e187980cd6c7d0b4ff732aa99e6e7fbd9bdf47ab.
</span>32773a5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 32773a5fa92892cae7b51ecc9a9f3f7bee649a77
</span>Author: Cyril Roelandt <tipecaml@gmail.com>
AuthorDate: Tue Dec 17 01:15:39 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> Fix tests broken by e187980cd6c7d0b4ff732aa99e6e7fbd9bdf47ab.
</span>---
upt_macports/tests/test_macports_package.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/upt_macports/tests/test_macports_package.py b/upt_macports/tests/test_macports_package.py
</span><span style='display:block; white-space:pre;color:#808080;'>index 23ccd31..c7ae376 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/upt_macports/tests/test_macports_package.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/upt_macports/tests/test_macports_package.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,11 @@ from unittest import mock
</span> from io import StringIO
<span style='display:block; white-space:pre;background:#e0ffe0;'>+class FakeLicense(upt.licenses.License):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name = 'Fake license'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ spdx_identifier = 'fake'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> class TestMacPortsPackageLicenses(unittest.TestCase):
def setUp(self):
self.package = MacPortsPackage()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +26,8 @@ class TestMacPortsPackageLicenses(unittest.TestCase):
</span> self.assertEqual(self.package.licenses, expected)
def test_unknown_license(self):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- self.package.upt_pkg.licenses = [upt.licenses.ZlibLicense()]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- expected = 'unknown # MacPorts license unknown for zlib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.package.upt_pkg.licenses = [FakeLicense]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ expected = 'unknown # MacPorts license unknown for fake'
</span> self.assertEqual(self.package.licenses, expected)
def test_bad_license(self):
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,9 +70,9 @@ class TestMacPortsPackageLicenses(unittest.TestCase):
</span> @mock.patch('sys.stdout', new_callable=StringIO)
def test_license_conversion_error(self, m_stdout, m_stderr):
upt.log.create_logger(logging.DEBUG)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- self.package.upt_pkg.licenses = [upt.licenses.ZlibLicense()]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.package.upt_pkg.licenses = [FakeLicense()]
</span> self.package.licenses
<span style='display:block; white-space:pre;background:#ffe0e0;'>- err = 'MacPorts license unknown for zlib\n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = 'MacPorts license unknown for fake\n'
</span> info = 'Please report the error at https://github.com/macports/upt-macports\n' # noqa
self.assertEqual(m_stdout.getvalue(), info)
self.assertEqual(m_stderr.getvalue(), err)
</pre><pre style='margin:0'>
</pre>