Merge lp:~raharper/curtin/trunk.lp1662346 into lp:~smoser/curtin/trunk.lp1662346

Proposed by Ryan Harper
Status: Merged
Merge reported by: Ryan Harper
Merged at revision: not available
Proposed branch: lp:~raharper/curtin/trunk.lp1662346
Merge into: lp:~smoser/curtin/trunk.lp1662346
Diff against target: 59 lines (+44/-0)
1 file modified
tests/unittests/test_curthooks.py (+44/-0)
To merge this branch: bzr merge lp:~raharper/curtin/trunk.lp1662346
Reviewer Review Type Date Requested Status
curtin developers Pending
Review via email: mp+316770@code.launchpad.net

Description of the change

Add unittest for s390-tools install for zipl

To post a comment you must log in.
lp:~raharper/curtin/trunk.lp1662346 updated
454. By Ryan Harper

Fix mocking of class via patch.object

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unittests/test_curthooks.py'
2--- tests/unittests/test_curthooks.py 2016-11-30 23:54:16 +0000
3+++ tests/unittests/test_curthooks.py 2017-02-08 21:18:26 +0000
4@@ -6,6 +6,7 @@
5
6 from curtin.commands import curthooks
7 from curtin import util
8+from curtin.reporter import events
9
10
11 class CurthooksBase(TestCase):
12@@ -131,4 +132,47 @@
13 ]
14 self.mock_subp.assert_has_calls(subp_calls)
15
16+
17+class TestInstallMissingPkgs(CurthooksBase):
18+ def setUp(self):
19+ super(TestInstallMissingPkgs, self).setUp()
20+ self.add_patch('platform.machine', 'mock_machine')
21+ self.add_patch('curtin.util.get_installed_packages',
22+ 'mock_get_installed_packages')
23+ self.add_patch('curtin.util.load_command_environment',
24+ 'mock_load_cmd_evn')
25+ self.add_patch('curtin.util.which', 'mock_which')
26+ self.add_patch('curtin.util.install_packages', 'mock_install_packages')
27+
28+ @patch.object(events, 'ReportEventStack')
29+ def test_install_packages_s390x(self, mock_events):
30+
31+ self.mock_machine.return_value = "s390x"
32+ self.mock_which.return_value = False
33+ target = "not-a-real-target"
34+ cfg = {}
35+ curthooks.install_missing_packages(cfg, target=target)
36+ self.mock_install_packages.assert_called_with(['s390-tools'],
37+ target=target)
38+
39+ @patch.object(events, 'ReportEventStack')
40+ def test_install_packages_s390x_has_zipl(self, mock_events):
41+
42+ self.mock_machine.return_value = "s390x"
43+ self.mock_which.return_value = True
44+ target = "not-a-real-target"
45+ cfg = {}
46+ curthooks.install_missing_packages(cfg, target=target)
47+ self.assertEqual([], self.mock_install_packages.call_args_list)
48+
49+ @patch.object(events, 'ReportEventStack')
50+ def test_install_packages_x86_64_no_zipl(self, mock_events):
51+
52+ self.mock_machine.return_value = "x86_64"
53+ target = "not-a-real-target"
54+ cfg = {}
55+ curthooks.install_missing_packages(cfg, target=target)
56+ self.assertEqual([], self.mock_install_packages.call_args_list)
57+
58+
59 # vi: ts=4 expandtab syntax=python

Subscribers

People subscribed via source and target branches

to all changes: