PR#1271: decode Popen.communicate result under py3 - koji

koji

#1271 decode Popen.communicate result under py3

Merged 4 years ago by mikem. Opened 4 years ago by tkopecek.

tkopecek/koji issue1270 into master

fix unittest for py3

Tomas Kopecek • 4 years ago

9c9ef93

decode Popen.communicate result under py3

Tomas Kopecek • 4 years ago

fd4ca33

koji/daemon.py

file modified

		`@@ -534,6 +534,8 @@`
		`if status != 0:`
		`raise koji.GenericError('Error getting commit hash for git')`
		`fragment = out.strip()`
		`+ if six.PY3:`
		`+ fragment = fragment.decode()`
		`scheme = self.scheme[:-3]`
		`netloc = self.host`
		`path = self.repository`

tests/test_scm.py

file modified

+2 -1

		`@@ -2,6 +2,7 @@`
		`import logging`
		`import mock`
		`import shutil`
		`+ import six`
		`import tempfile`
		`try:`
		`import unittest2 as unittest`
		`@@ -385,7 +386,7 @@`
		`def test_get_source_git(self, popen):`
		`popen.return_value.wait.return_value = 0`
		`popen.return_value.communicate = mock.MagicMock()`
		`- popen.return_value.communicate.return_value = ('hash ', 'any')`
		`+ popen.return_value.communicate.return_value = (six.b('hash '), six.b('any'))`

		`url = "git://default/koji.git#asdasd"`
		`scm = SCM(url)`

tkopecek commented 4 years ago

Fixes: https://pagure.io/koji/issue/1270

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

4 years ago

ngompa commented 4 years ago

:thumbsup:

mikem commented 4 years ago

unit tests break on py3. looks like we need to adjust the mocking

======================================================================
ERROR: test_get_source_git (tests.test_scm.TestSCMCheckouts)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3.6/site-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
  File "/home/mike/Devel/koji/koji/tests/test_scm.py", line 396, in test_get_source_git
    source = scm.get_source()
  File "/home/mike/Devel/koji/koji/koji/daemon.py", line 538, in get_source
    fragment = fragment.decode()
AttributeError: 'str' object has no attribute 'decode'

----------------------------------------------------------------------

1 new commit added