particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't spawn process for rpmdiff

Browse source 
Speed improvement by using bundled rpmdiff library instead of spawning
special process.

Related: https://pagure.io/koji/issue/715
This commit is contained in:
Tomas Kopecek 2018-01-02 14:59:58 +01:00 • committed by Mike McLean
parent 22cab9615d
commit fb0ba44a3c
2 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

36
tests/test_hub/test_rpmdiff.py
View file

@ -8,30 +8,30 @@ import kojihub
class TestRPMDiff(unittest.TestCase):
@mock.patch('kojihub.subprocess')
def test_rpmdiff_empty_invocation(self, subprocess):
process = mock.MagicMock()
subprocess.Popen.return_value = process
@mock.patch('kojihub._rpmdiff.Rpmdiff')
def test_rpmdiff_empty_invocation(self, Rpmdiff):
kojihub.rpmdiff('basepath', [])
self.assertEquals(len(subprocess.Popen.mock_calls), 0)
Rpmdiff.assert_not_called()
kojihub.rpmdiff('basepath', ['foo'])
self.assertEquals(len(subprocess.Popen.mock_calls), 0)
Rpmdiff.assert_not_called()
@mock.patch('kojihub.subprocess')
def test_rpmdiff_simple_success(self, subprocess):
process = mock.MagicMock()
subprocess.Popen.return_value = process
process.wait.return_value = 0
kojihub.rpmdiff('basepath', ['foo', 'bar'])
self.assertEquals(len(subprocess.Popen.call_args_list), 1)
@mock.patch('kojihub._rpmdiff.Rpmdiff')
def test_rpmdiff_simple_success(self, Rpmdiff):
d = mock.MagicMock()
d.differs.return_value = False
Rpmdiff.return_value = d
self.assertFalse(kojihub.rpmdiff('basepath', ['foo', 'bar']))
Rpmdiff.assert_called_once_with('basepath/foo', 'basepath/bar', ignore='S5TN')
@mock.patch('kojihub.subprocess')
def test_rpmdiff_simple_failure(self, subprocess):
process = mock.MagicMock()
subprocess.Popen.return_value = process
process.wait.return_value = 1
@mock.patch('kojihub._rpmdiff.Rpmdiff')
def test_rpmdiff_simple_failure(self, Rpmdiff):
d = mock.MagicMock()
d.differs.return_value = True
Rpmdiff.return_value = d
with self.assertRaises(koji.BuildError):
kojihub.rpmdiff('basepath', ['foo', 'bar'])
Rpmdiff.assert_called_once_with('basepath/foo', 'basepath/bar', ignore='S5TN')
d.textdiff.assert_called_once_with()
class TestCheckNoarchRpms(unittest.TestCase):
@mock.patch('kojihub.rpmdiff')