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

[Thomas Bechtold]

Fix tests

[Paride Legovini (paride)]

I can confirm the tests pass now. Thanks!

review: Approve

[Paride Legovini (paride)]

I can confirm the tests pass now. Thanks!

review: Approve

diff --git a/jlp/commands/launchpadTrigger.py b/jlp/commands/launchpadTrigger.py
index 0d4649b..0bc4dd3 100644
--- a/jlp/commands/launchpadTrigger.py
+++ b/jlp/commands/launchpadTrigger.py
@@ -33,6 +33,7 @@ def trigger_jenkins(branch,
                     jenkins_url=None,
                     fasttrack_merge=False,
                     lock_name='',
+                    lock_timeout=None,
                     repo_type='auto'):
     """Trigger a Jenkins build."""
 
diff --git a/tests/test_launchpadTrigger.py b/tests/test_launchpadTrigger.py
index 78075e1..5060724 100644
--- a/tests/test_launchpadTrigger.py
+++ b/tests/test_launchpadTrigger.py
@@ -189,7 +189,7 @@ class TestLockNames(PatchedLaunchpadTriggerTest):
                 as socketLock:
             launchpadTrigger()
             socketLock.assert_called_with(
-                get_config_option('lock_name') + '-launchpadTrigger')
+                get_config_option('lock_name') + '-launchpadTrigger', None)
 
     def test_trigger_with_lock_name(self):
         """Trigger autolanding with a custom launchpadlib lockname."""
@@ -200,7 +200,7 @@ class TestLockNames(PatchedLaunchpadTriggerTest):
                 as socketLock:
             launchpadTrigger()
             socketLock.assert_called_with(
-                get_config_option('lock_name') + '-' + lock_name)
+                get_config_option('lock_name') + '-' + lock_name, None)
 
 
 class TestTriggerJenkins(unittest.TestCase):