Merge ~toabctl/jenkins-launchpad-plugin:master-fix-tests into jenkins-launchpad-plugin:master

Proposed by Thomas Bechtold
Status: Merged
Merged at revision: 7dfde3e0f00e22c8337dcfef8878b534da16c187
Proposed branch: ~toabctl/jenkins-launchpad-plugin:master-fix-tests
Merge into: jenkins-launchpad-plugin:master
Diff against target: 34 lines (+3/-2)
2 files modified
jlp/commands/launchpadTrigger.py (+1/-0)
tests/test_launchpadTrigger.py (+2/-2)
Reviewer Review Type Date Requested Status
Paride Legovini Approve
Review via email: mp+430316@code.launchpad.net

Commit message

Fix tests

To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

I can confirm the tests pass now. Thanks!

review: Approve
Revision history for this message
Paride Legovini (paride) wrote :

I can confirm the tests pass now. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jlp/commands/launchpadTrigger.py b/jlp/commands/launchpadTrigger.py
2index 0d4649b..0bc4dd3 100644
3--- a/jlp/commands/launchpadTrigger.py
4+++ b/jlp/commands/launchpadTrigger.py
5@@ -33,6 +33,7 @@ def trigger_jenkins(branch,
6 jenkins_url=None,
7 fasttrack_merge=False,
8 lock_name='',
9+ lock_timeout=None,
10 repo_type='auto'):
11 """Trigger a Jenkins build."""
12
13diff --git a/tests/test_launchpadTrigger.py b/tests/test_launchpadTrigger.py
14index 78075e1..5060724 100644
15--- a/tests/test_launchpadTrigger.py
16+++ b/tests/test_launchpadTrigger.py
17@@ -189,7 +189,7 @@ class TestLockNames(PatchedLaunchpadTriggerTest):
18 as socketLock:
19 launchpadTrigger()
20 socketLock.assert_called_with(
21- get_config_option('lock_name') + '-launchpadTrigger')
22+ get_config_option('lock_name') + '-launchpadTrigger', None)
23
24 def test_trigger_with_lock_name(self):
25 """Trigger autolanding with a custom launchpadlib lockname."""
26@@ -200,7 +200,7 @@ class TestLockNames(PatchedLaunchpadTriggerTest):
27 as socketLock:
28 launchpadTrigger()
29 socketLock.assert_called_with(
30- get_config_option('lock_name') + '-' + lock_name)
31+ get_config_option('lock_name') + '-' + lock_name, None)
32
33
34 class TestTriggerJenkins(unittest.TestCase):

Subscribers

People subscribed via source and target branches