Merge ~paride/jenkins-launchpad-plugin:py3 into jenkins-launchpad-plugin:master

[Paride Legovini]

Convert package to Python 3

[Paride Legovini (paride)]

All the tests are passing. Can be tested with:

 $ python3 setup.py build test clean

As for tarmac I have a branch with a overhauled debian/ directory, but let's take care of the Python 3 conversion first.

[Joshua Powers (powersj)]

Can you show an example of this working using some test LP project please? Otherwise 2 in-line questions?

[Paride Legovini (paride)]

Thanks for reviewing. I'll setup a test project. On the inline questions: both the lines are left overs from me debugging the test, they are to be removed.

[Paride Legovini (paride)]

Lines removed; all tests still passing.

[Paride Legovini (paride)]

Tested against the lp:paride-test-project project. This is the MP I used for testing:

https://code.launchpad.net/~legovini/paride-test-project/+git/paride-test-project/+merge/376785

voteOnMergeProposal marked it as Needs Fixing when the result was not PASSED, otherwise it approved it. The autoland script did nothing until I manually set the MP status to Approved. Once I did so it correctly merged the MP. The merged branch is visible in the commit history here:

https://code.launchpad.net/~legovini/paride-test-project/+git/paride-test-project/+ref/master

The allowed_users list in jlp.config works as expected.

I faked the test a little but as I didn't setup a full CI set of jobs to test JLP, instead I pointed it to the curtin-ci Jenkins jobs. I'll do another few tests before merging, but so far it seems to be working fine.

[Paride Legovini (paride)]

The root of the problem seems to be:

[ 267.086787] cloud-init[1461]: Processing triggers for linux-image-4.4.0-170-generic (4.4.0-170.199) ...
[ 267.410038] cloud-init[1461]: /etc/kernel/postinst.d/zz-flash-kernel:
[ 267.411989] cloud-init[1461]: flash-kernel: deferring update (trigger activated)
[ 267.423883] cloud-init[1461]: Processing triggers for flash-kernel (3.0~rc.4ubuntu62.2) ...
[ 267.563889] cloud-init[1461]: Can't find /boot/vmlinuz-4.4.0-170-generic or /boot/initrd.img-4.4.0-170-generic
[ 267.579645] cloud-init[1461]: dpkg: error processing package flash-kernel (--configure):
[ 267.591371] cloud-init[1461]: subprocess installed post-installation script returned error exit status 1
[ 267.596234] cloud-init[1461]: Errors were encountered while processing:
[ 267.599077] cloud-init[1461]: flash-kernel

Likely to be caused by this commit:

https://git.launchpad.net/curtin/commit/?id=04adfd9a83964ccec944b0f015143ea3b5b21473

Possible workaround: restrict the "run update-initramfs once" logic to arm64 until we find what goes wrong on arm64 and s390x.

[Paride Legovini (paride)]

Wrong brower tab :)

[Joshua Powers (powersj)]

review: Approve

diff --git a/.gitignore b/.gitignore
index bf01a23..9379187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
 docs/_build/*
-./bin
-./share
-./local
-./lib
-./include
-./jenkins_launchpad_plugin.egg-info
-./man
+/bin
+/share
+/local
+/lib
+/include
+/jenkins_launchpad_plugin.egg-info
+/man
+__pycache__
+*.pyc
+build
diff --git a/HACKING b/HACKING
 deleted file mode 100644
index b0555b8..0000000
--- a/HACKING
+++ /dev/null
@@ -1,23 +0,0 @@
-If you are not running Ubuntu raring or later you will need run the 
-following in order to install pyruntest:
-    * sudo add-apt-repository ppa:autopilot/ppa
-
-
-You need the following if you want to make changes/run this project:
-    * sudo apt-get install -y python-launchpadlib python-bzrlib python-mock python-testtools python-jenkins python-lockfile python-testscenarios python-pyruntest python-yaml python-git python-jinja2
-    * install tarmac:
-        bzr branch lp:tarmac
-        cd tarmac
-        sudo python setup.py install
-
-To run the tests:
-   * pyruntest tests
-
-Virtualenv instructions:
-$ sudo apt-get install python-virtualenv
-$ virtualenv . --system-site-packages
-$ bin/python setup.py develop
-$ bzr branch lp:tarmac ../tarmac
-$ jlp=$(pwd)
-$ cd ../tarmac
-$ $jlp/bin/python setup.py install
diff --git a/autoland.py b/autoland.py
 deleted file mode 120000
index f8abc68..0000000
--- a/autoland.py
+++ /dev/null
@@ -1 +0,0 @@
-scripts/autoland
 \ No newline at end of file
diff --git a/dput b/dput
 deleted file mode 120000
index f63205d..0000000
--- a/dput
+++ /dev/null
@@ -1 +0,0 @@
-scripts/dput
 \ No newline at end of file
diff --git a/getMergeProposals.py b/getMergeProposals.py
 deleted file mode 120000
index 80e275c..0000000
--- a/getMergeProposals.py
+++ /dev/null
@@ -1 +0,0 @@
-scripts/getMergeProposals
 \ No newline at end of file
diff --git a/jlp/__init__.py b/jlp/__init__.py
index 00d6adc..9802aea 100644
--- a/jlp/__init__.py
+++ b/jlp/__init__.py
@@ -8,7 +8,7 @@ jlp
 """
 
 __name__ = 'jlp'
-__version__ = '0.1'
+__version__ = '3.1'
 __author__ = 'Martin Mrazik'
 
 import jinja2
diff --git a/jlp/branch.py b/jlp/branch.py
index 5334d6f..9462f88 100644
--- a/jlp/branch.py
+++ b/jlp/branch.py
@@ -1,7 +1,7 @@
 import logging
-from bzrlib.plugin import load_plugins
+from breezy.plugin import load_plugins
 load_plugins()
-from bzrlib import branch as bzr_branch
+from breezy import branch as bzr_branch
 from tarmac.branch import Branch as TarmacBranch
 from tarmac.branch import BranchConfig
 from jlp import get_config_option
diff --git a/jlp/commands/__init__.py b/jlp/commands/__init__.py
 deleted file mode 100644
index e69de29..0000000
--- a/jlp/commands/__init__.py
+++ /dev/null
diff --git a/jlp/commands/autoland.py b/jlp/commands/autoland.py
index ba95372..a4552f0 100644
--- a/jlp/commands/autoland.py
+++ b/jlp/commands/autoland.py
@@ -7,10 +7,10 @@ from jlp.launchpadutils import (LaunchpadVote, get_vote_subject,
                                 get_target_branch, get_source_branch,
                                 is_git_project)
 from jlp import (launchpadutils, Branch,
-                 DputRunner, jenkinsutils, get_launchpad,
+                 DputRunner, get_launchpad,
                  get_config_option, logger, get_jinja_environment)
 from tarmac.exceptions import TarmacMergeError, BranchHasConflicts
-from bzrlib.errors import LockFailed
+from breezy.errors import LockFailed
 import os
 from shutil import rmtree
 import tempfile
diff --git a/jlp/commands/voteOnMergeProposal.py b/jlp/commands/voteOnMergeProposal.py
index dab10ef..bf9f008 100644
--- a/jlp/commands/voteOnMergeProposal.py
+++ b/jlp/commands/voteOnMergeProposal.py
@@ -1,7 +1,6 @@
 from argparse import ArgumentParser
 import atexit
-import jinja2
-from jlp import launchpadutils, get_launchpad, logger, get_config_option, get_jinja_environment
+from jlp import launchpadutils, get_launchpad, logger, get_jinja_environment
 import re
 import os
 from shutil import rmtree
diff --git a/jlp/dputrunner.py b/jlp/dputrunner.py
index cfce696..d096d77 100644
--- a/jlp/dputrunner.py
+++ b/jlp/dputrunner.py
@@ -37,7 +37,7 @@ class DputRunner:
             return self.versionFormat.format(**kwargs)
         except KeyError as error:
             logger.error('Unkown variable used in format string: ' +
-                         error.message)
+                         str(error))
             return None
 
     def _run_hooks(self, hooks, cwd):
diff --git a/jlp/jenkinsutils.py b/jlp/jenkinsutils.py
index 2083d45..8b94b1b 100644
--- a/jlp/jenkinsutils.py
+++ b/jlp/jenkinsutils.py
@@ -2,18 +2,16 @@ import re
 import os
 from xml.dom.minidom import parseString
 import jenkins
-import urlparse
-import urllib2
-import launchpadutils
-from textwrap import dedent
+import urllib
+from . import launchpadutils
 from . import get_json_jenkins
 from lazr.restfulclient.errors import Unauthorized
 from jlp import logger, get_config_option, get_jinja_environment
 
 
 def normalize_url(url):
-    return urlparse.urljoin(url,
-                            urlparse.urlparse(url).path.replace('//', '/'))
+    return urllib.parse.urljoin(url,
+                            urllib.parse.urlparse(url).path.replace('//', '/'))
 
 
 def _actions_has_param(actions, param, value):
@@ -427,7 +425,7 @@ def is_pipeline_job(jenkins, job_url):
     try:
         data = jenkins.get_json_data(job_url + 'wfapi',
                                      append_api=False)
-    except urllib2.HTTPError:
+    except urllib.error.HTTPError:
         data = None
 
     if data:
@@ -755,7 +753,7 @@ def start_jenkins_job(lp_handle, launchpaduser, jenkins_url, jenkins_job, mp,
     try:
         is_merge_only = launchpadutils.is_merge_only(mp)
     except LookupError as error:
-        logger.error(error.message)
+        logger.error(str(error))
         logger.debug('Skipping this merge proposal')
         return False
 
diff --git a/jlp/jsonjenkins.py b/jlp/jsonjenkins.py
index 98ab1e4..353043f 100644
--- a/jlp/jsonjenkins.py
+++ b/jlp/jsonjenkins.py
@@ -1,5 +1,5 @@
 import json
-import urllib2
+import urllib
 
 
 class JSONJenkins():
@@ -9,11 +9,11 @@ class JSONJenkins():
         self.jenkins_url = jenkins_url
         self.jenkins_proxy_url = jenkins_proxy_url
 
-        passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
+        passman = urllib.request.HTTPPasswordMgrWithDefaultRealm()
         passman.add_password(None, jenkins_url, username, password)
-        authhandler = urllib2.HTTPBasicAuthHandler(passman)
-        self.urllib_opener = urllib2.build_opener(authhandler)
-        urllib2.install_opener(self.urllib_opener)
+        authhandler = urllib.request.HTTPBasicAuthHandler(passman)
+        self.urllib_opener = urllib.request.build_opener(authhandler)
+        urllib.request.install_opener(self.urllib_opener)
 
     def patch_url(self, url):
         # Test for presence of a url that needs to be patched.
@@ -30,5 +30,5 @@ class JSONJenkins():
         url = self.patch_url(url)
         if append_api:
             url = url + '/api/json'
-        data = urllib2.urlopen(url)
+        data = urllib.request.urlopen(url)
         return json.load(data)
diff --git a/jlp/launchpadagent.py b/jlp/launchpadagent.py
index 65e0621..fd29d81 100644
--- a/jlp/launchpadagent.py
+++ b/jlp/launchpadagent.py
@@ -31,7 +31,7 @@ class AuthorizeRequestTokenWithConsole(RequestTokenAuthorizationEngine):
 
         """
         authorization_url = self.authorization_url(request_token)
-        print WAITING_FOR_USER.format(authorization_url)
+        print(WAITING_FOR_USER.format(authorization_url))
         # if we don't flush we may not see the message
         sys.stdout.flush()
         while credentials.access_token is None:
@@ -40,7 +40,7 @@ class AuthorizeRequestTokenWithConsole(RequestTokenAuthorizationEngine):
                 credentials.exchange_request_token_for_access_token(
                     self.web_root)
                 break
-            except HTTPError, e:
+            except HTTPError as e:
                 if e.response.status == 403:
                     # The user decided not to authorize this
                     # application.
diff --git a/jlp/launchpadutils.py b/jlp/launchpadutils.py
index 7197180..4c50bba 100644
--- a/jlp/launchpadutils.py
+++ b/jlp/launchpadutils.py
@@ -1,6 +1,6 @@
-import os, re
+import re
 from jlp import logger, get_config_option
-import jenkinsutils
+from jlp import jenkinsutils
 from . import get_json_jenkins
 
 RE_LP_BUG_IDS = r'LP:(,? #\d+)+\s*$'
@@ -283,7 +283,7 @@ def users_allowed_to_trigger_jobs(lp_users):
         try:
             allowed_person = lp.people[allowed]
         except KeyError:
-            logger.warn('User {} from the allowed_users list is not in '
+            logger.warning('User {} from the allowed_users list is not in '
                         'launchpad!'.format(allowed))
             continue
         if not allowed_person.is_team:
diff --git a/launchpadTrigger.py b/launchpadTrigger.py
 deleted file mode 120000
index 128f211..0000000
--- a/launchpadTrigger.py
+++ /dev/null
@@ -1 +0,0 @@
-scripts/launchpadTrigger
 \ No newline at end of file
diff --git a/scripts/autoland b/scripts/autoland
index 7ffac75..6279088 100755
--- a/scripts/autoland
+++ b/scripts/autoland
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 # this is to keep backwards compatibility with deployments directly from
 # bzr branch
diff --git a/scripts/dput b/scripts/dput
index 5d4e952..7bef560 100755
--- a/scripts/dput
+++ b/scripts/dput
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 # this is to keep backwards compatibility with deployments directly from
 # bzr branch
diff --git a/scripts/getMergeProposals b/scripts/getMergeProposals
index f21ffaf..c2b072b 100755
--- a/scripts/getMergeProposals
+++ b/scripts/getMergeProposals
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 # this is to keep backwards compatibility with deployments directly from
 # bzr branch
diff --git a/scripts/launchpadTrigger b/scripts/launchpadTrigger
index e62d7fc..28aa2e3 100755
--- a/scripts/launchpadTrigger
+++ b/scripts/launchpadTrigger
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 # this is to keep backwards compatibility with deployments directly from
 # bzr branch
diff --git a/scripts/voteOnMergeProposal b/scripts/voteOnMergeProposal
index c9274a6..61f099c 100755
--- a/scripts/voteOnMergeProposal
+++ b/scripts/voteOnMergeProposal
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 # this is to keep backwards compatibility with deployments directly from
 # bzr branch
diff --git a/setup.py b/setup.py
index db40a0b..346810d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,10 @@
 from distutils.core import setup
 from setuptools import find_packages
+from jlp import __version__
 import glob
 setup(
     name='jenkins-launchpad-plugin',
-    version='0.1',
+    version=__version__,
     url='https://launchpad.net/jenkins-launchpad-plugin',
     packages=find_packages(),
     include_package_data=True,
diff --git a/tests/__init__.py b/tests/__init__.py
index 2cce6c0..2843c1f 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -160,7 +160,7 @@ class JenkinsJSONData():
 
     def get_json_data(self, url, append_api=True):
         url = url.rstrip('/')
-        print url
+        print(url)
         if url == 'http://10.0.0.1:8080/job/my-job':
             return self.job_data
         elif url == 'http://10.0.0.1:8080/job/my-job/3':
diff --git a/tests/test_autoland.py b/tests/test_autoland.py
index e6d1aef..e82de4f 100644
--- a/tests/test_autoland.py
+++ b/tests/test_autoland.py
@@ -1,10 +1,10 @@
 import unittest
-from mock import patch
-from mock import MagicMock
+from unittest.mock import patch
+from unittest.mock import MagicMock
 import tests.util as util
 from jlp import get_config_option
 from tarmac.exceptions import TarmacMergeError, BranchHasConflicts
-from bzrlib.errors import LockFailed
+from breezy.errors import LockFailed
 from jlp.launchpadutils import LaunchpadVote
 import jlp.commands.autoland as autoland
 
@@ -18,7 +18,7 @@ class TestGetFixesCommitMessage(unittest.TestCase):
             b.web_link = 'http://' + str(i)
             mp.source_branch.linked_bugs_collection.append(b)
         ret = autoland.get_fixes_commit_message(mp)
-        expected = ' Fixes: http://0, http://1, http://2, http://3.'
+        expected = ' Fixes: http://0, http://1, http://2, http://3'
         self.assertEqual(ret, expected)
 
     def test_no_bugs(self):
@@ -198,7 +198,7 @@ class TestAutolandVoting(TestAutolandForMergeAndCommit):
     def test_last_vote_was_needs_fixing(self):
         sys_argv = ['autoland.py', '-r', 'PASSED',
                     '-v', '123', '-m', 'url']
-        merge_and_commit = lambda x, y: 0
+        merge_and_commit = lambda x, y, z: 0
         get_last_mp_vote = lambda x: LaunchpadVote.NEEDS_FIXING
         with patch('sys.argv', sys_argv), \
             patch(
@@ -215,7 +215,7 @@ class TestAutolandVoting(TestAutolandForMergeAndCommit):
     def test_last_vote_was_approved(self):
         sys_argv = ['autoland.py', '-r', 'PASSED',
                     '-v', '123', '-m', 'url']
-        merge_and_commit = lambda y, z: 0
+        merge_and_commit = lambda x, y, z: 0
         get_last_mp_vote = lambda x: LaunchpadVote.APPROVE
         with patch('sys.argv', sys_argv), \
             patch('jlp.commands.autoland.get_last_mp_vote',
@@ -223,7 +223,7 @@ class TestAutolandVoting(TestAutolandForMergeAndCommit):
                 patch('jlp.commands.autoland.merge_and_commit',
                       merge_and_commit):
             autoland.autoland()
-            self.assertEquals(self.mp.createComment.call_count, 0)
+            self.assertEqual(self.mp.createComment.call_count, 0)
 
 
 class TestAutolandMergeAndCommitWithDescription(TestAutolandForMergeAndCommit):
@@ -250,12 +250,13 @@ class TestAutolandWithMultipleDputs(TestAutolandForMergeAndCommit):
                     '-d', 'quantal,precise']
         dputRunner = MagicMock()
         with patch('sys.argv', sys_argv), \
-                patch('jlp.commands.autoland.DputRunner', new=dputRunner):
+                patch('jlp.commands.autoland.DputRunner', new=dputRunner), \
+                patch('jlp.commands.autoland.get_config_option'):
             self.assertTrue(autoland.autoland() == 0)
             ppas_expected = ['ppa:myppa', 'ppa:myppa2']
             distributions_expected = ['quantal', 'precise']
-            self.assertEquals(ppas_expected, dputRunner.call_args[1]['ppas'])
-            self.assertEquals(distributions_expected,
+            self.assertEqual(ppas_expected, dputRunner.call_args[1]['ppas'])
+            self.assertEqual(distributions_expected,
                               dputRunner.call_args[1]['distributions'])
 
 
@@ -266,7 +267,8 @@ class TestAutolandWithReleaseOnly(TestAutolandForMergeAndCommit):
                     '-d', 'quantal', '--release-only']
         dputRunner = MagicMock()
         with patch('sys.argv', sys_argv), \
-                patch('jlp.commands.autoland.DputRunner', new=dputRunner):
+                patch('jlp.commands.autoland.DputRunner', new=dputRunner), \
+                patch('jlp.commands.autoland.get_config_option'):
             autoland.autoland()
             self.assertTrue(dputRunner.call_args[1]['release_only'])
 
@@ -278,10 +280,11 @@ class TestAutolandWithVersionFormatString(TestAutolandForMergeAndCommit):
                     '-d', 'quantal', '-f', '{PACKAGE_VERSION}0']
         dputRunner = MagicMock()
         with patch('sys.argv', sys_argv), \
-                patch('jlp.commands.autoland.DputRunner', new=dputRunner):
+                patch('jlp.commands.autoland.DputRunner', new=dputRunner), \
+                patch('jlp.commands.autoland.get_config_option'):
             self.assertTrue(autoland.autoland() == 0)
             version_format_expected = '{PACKAGE_VERSION}0'
-            self.assertEquals(version_format_expected,
+            self.assertEqual(version_format_expected,
                               dputRunner.call_args[1]['versionFormat'])
 
     def test_quoted_string(self):
@@ -290,10 +293,11 @@ class TestAutolandWithVersionFormatString(TestAutolandForMergeAndCommit):
                     '-d', 'quantal', '-f', '"{PACKAGE_VERSION}"']
         dputRunner = MagicMock()
         with patch('sys.argv', sys_argv), \
-                patch('jlp.commands.autoland.DputRunner', new=dputRunner):
+                patch('jlp.commands.autoland.DputRunner', new=dputRunner), \
+                patch('jlp.commands.autoland.get_config_option'):
             self.assertTrue(autoland.autoland() == 0)
             version_format_expected = '{PACKAGE_VERSION}'
-            self.assertEquals(version_format_expected,
+            self.assertEqual(version_format_expected,
                               dputRunner.call_args[1]['versionFormat'])
 
 
@@ -317,7 +321,8 @@ class TestAutolandMergeCommitAndDput(TestAutolandForMergeAndCommit):
                     '-a', 'packaging_branch', '-b',
                     'http://10.0.0.1:8080/job/unity-daily/17/', '-d',
                     'precise']
-        with patch('sys.argv', sys_argv):
+        with patch('sys.argv', sys_argv), \
+             patch('jlp.commands.autoland.get_config_option'):
             self.assertTrue(autoland.autoland() == 0)
             self.assertTrue(self.target.merge.call_count == 1)
             self.assertTrue(self.target.commit.call_count == 1)
diff --git a/tests/test_bzrrecipe.py b/tests/test_bzrrecipe.py
index be211ea..b31c564 100644
--- a/tests/test_bzrrecipe.py
+++ b/tests/test_bzrrecipe.py
@@ -1,6 +1,6 @@
 import unittest
-from mock import patch
-from mock import MagicMock
+from unittest.mock import patch
+from unittest.mock import MagicMock
 from jlp import BzrRecipe
 from textwrap import dedent
 
@@ -15,8 +15,8 @@ class TestBzrRecipeInstantiation(unittest.TestCase):
                               nest-part ubuntu lp:dummy/packaging debian
                               ''')
             recipe.generateRecipe()
-            self.assertEquals(recipe.recipe, expected)
-            self.assertEquals(recipe.getTrunkRevno(), 14)
+            self.assertEqual(recipe.recipe, expected)
+            self.assertEqual(recipe.getTrunkRevno(), 14)
 
     def test_check_recipe_without_explicit_revision(self):
         bzr = MagicMock()
@@ -29,8 +29,8 @@ class TestBzrRecipeInstantiation(unittest.TestCase):
                               nest-part ubuntu lp:dummy/packaging debian
                               ''')
             recipe.generateRecipe()
-            self.assertEquals(recipe.recipe, expected)
-            self.assertEquals(recipe.getTrunkRevno(), 10)
+            self.assertEqual(recipe.recipe, expected)
+            self.assertEqual(recipe.getTrunkRevno(), 10)
 
     def test_check_recipe_without_packaging_branch(self):
         bzr = MagicMock()
@@ -43,8 +43,8 @@ class TestBzrRecipeInstantiation(unittest.TestCase):
                               # No packaging branch
                               ''')
             recipe.generateRecipe()
-            self.assertEquals(recipe.recipe, expected)
-            self.assertEquals(recipe.getTrunkRevno(), 10)
+            self.assertEqual(recipe.recipe, expected)
+            self.assertEqual(recipe.getTrunkRevno(), 10)
 
     def test_check_recipe_with_inline_packaging(self):
         bzr = MagicMock()
@@ -57,15 +57,15 @@ class TestBzrRecipeInstantiation(unittest.TestCase):
                               # No packaging branch
                               ''')
             recipe.generateRecipe()
-            self.assertEquals(recipe.recipe, expected)
-            self.assertEquals(recipe.getTrunkRevno(), 10)
+            self.assertEqual(recipe.recipe, expected)
+            self.assertEqual(recipe.getTrunkRevno(), 10)
 
     def test_get_packaging_branch_revno(self):
         bzr = MagicMock()
         bzr.revno = lambda self: 10
         with patch('jlp.bzrrecipe.Bazaar', new=MagicMock(return_value=bzr)):
             recipe = BzrRecipe('lp:dummy', 'lp:dummy/packaging', 14)
-            self.assertEquals(recipe.getPackagingBranchRevno(), 10)
+            self.assertEqual(recipe.getPackagingBranchRevno(), 10)
 
     def test_getDir_before_tree_building(self):
         with patch('jlp.bzrrecipe.Bazaar'):
@@ -219,10 +219,10 @@ class TestBzrRecipe(unittest.TestCase):
 class TestBzrRecipeBuildTree(TestBzrRecipe):
     def test_buildTree(self):
             self.recipe.buildTree()
-            self.assertEquals(
+            self.assertEqual(
                 self.open_file.__enter__.return_value.write.call_count, 1)
-            self.assertEquals(self.recipe.getBuildDir(), self.temp_dir)
-            self.assertEquals(self.recipe.getTrunkDir(),
+            self.assertEqual(self.recipe.getBuildDir(), self.temp_dir)
+            self.assertEqual(self.recipe.getTrunkDir(),
                               self.temp_dir + '/trunk')
 
 
@@ -230,10 +230,10 @@ class TestBzrRecipeBuildTreeTwice(TestBzrRecipe):
     def test_buildTree_twice(self):
             self.recipe.buildTree()
             self.recipe.buildTree()
-            self.assertEquals(
+            self.assertEqual(
                 self.open_file.__enter__.return_value.write.call_count, 1)
-            self.assertEquals(self.recipe.getBuildDir(), self.temp_dir)
-            self.assertEquals(self.recipe.getTrunkDir(),
+            self.assertEqual(self.recipe.getBuildDir(), self.temp_dir)
+            self.assertEqual(self.recipe.getTrunkDir(),
                               self.temp_dir + '/trunk')
 
 
diff --git a/tests/test_dput.py b/tests/test_dput.py
index b9267d9..3977d70 100644
--- a/tests/test_dput.py
+++ b/tests/test_dput.py
@@ -1,6 +1,6 @@
 import jlp.commands.dput as dput
 import unittest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 
 class TestDput(unittest.TestCase):
diff --git a/tests/test_dputrunner.py b/tests/test_dputrunner.py
index 80c35bd..8c51f38 100644
--- a/tests/test_dputrunner.py
+++ b/tests/test_dputrunner.py
@@ -1,8 +1,8 @@
 import unittest
-from mock import patch, MagicMock
-import mock
+from unittest.mock import patch, MagicMock
+from unittest import mock
 try:
-    from mock import call
+    from unittest.mock import call
 except ImportError:
     pass
 from jlp import DputRunner
@@ -69,8 +69,6 @@ class TestDputRunner(TestDputBase):
                           release_only=release_only))
         return calls
 
-    @unittest.skipIf(StrictVersion(mock.__version__) < StrictVersion('0.8'),
-                     "assert_has_calls not suppored by mock < 0.8")
     def test_dput(self):
         recipe = MagicMock()
         recipe.getTrunkRevno = lambda: 10
@@ -81,8 +79,6 @@ class TestDputRunner(TestDputBase):
             calls = self._build_calls(recipe, False)
             self.dput_runner.doDput.assert_has_calls(calls)
 
-    @unittest.skipIf(StrictVersion(mock.__version__) < StrictVersion('0.8'),
-                     "assert_has_calls not suppored by mock < 0.8")
     def test_dput_release_only(self):
         recipe = MagicMock()
         recipe.getTrunkRevno = lambda: 10
@@ -154,8 +150,6 @@ class TestDput(TestDputBase):
                               cwd='/build'))
             return calls
 
-    @unittest.skipIf(StrictVersion(mock.__version__) < StrictVersion('0.8'),
-                     "assert_has_calls not suppored by mock < 0.8")
     def test_doDput(self):
         recipe = self._build_recipe()
         check_call = MagicMock()
@@ -173,8 +167,6 @@ class TestDput(TestDputBase):
                                       release_only=False)
             check_call.assert_has_calls(calls)
 
-    @unittest.skipIf(StrictVersion(mock.__version__) < StrictVersion('0.8'),
-                     "assert_has_calls not suppored by mock < 0.8")
     def test_doDput_with_epoch(self):
         recipe = self._build_recipe()
         check_call = MagicMock()
@@ -193,8 +185,6 @@ class TestDput(TestDputBase):
                                       release_only=False)
             check_call.assert_has_calls(calls)
 
-    @unittest.skipIf(StrictVersion(mock.__version__) < StrictVersion('0.8'),
-                     "assert_has_calls not suppored by mock < 0.8")
     def test_doReleaseOnlyDput(self):
         recipe = self._build_recipe()
         check_call = MagicMock()
@@ -287,7 +277,7 @@ class DPutVersionTests(TestWithScenarios, TestDput):
 
         ('unknown tag',
             {
-                'formatString': '{PACKAGE_VERSION}-{UNKOWN_TAG}',
+                'formatString': '{PACKAGE_VERSION}-{UNKNOWN_TAG}',
                 'variables': {
                     'PACKAGE_VERSION': 13,
                     'BZR_REVISION': 43,
@@ -303,4 +293,4 @@ class DPutVersionTests(TestWithScenarios, TestDput):
         self.make_dput_runner(versionFormat=self.formatString)
 
         result_format = self.dput_runner.formatVersionString(**self.variables)
-        self.assertEquals(self.expectedResult, result_format)
+        self.assertEqual(self.expectedResult, result_format)
diff --git a/tests/test_getMergeProposals.py b/tests/test_getMergeProposals.py
index 4c1cc4f..399350b 100644
--- a/tests/test_getMergeProposals.py
+++ b/tests/test_getMergeProposals.py
@@ -1,5 +1,5 @@
 import unittest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import tests.util as util
 from jlp.commands.getMergeProposals import getMergeProposals
 
@@ -32,12 +32,12 @@ class TestGetMergeProposal(unittest.TestCase):
         """No branch specified; exit with error message."""
 
         sys_argv = ['getMergeProposals.py']
-        error_message = 'error: too few arguments'
+        error_message = 'error: the following arguments are required: branch'
         with patch('sys.argv', sys_argv), util.captured_stderr() as stderr:
             with self.assertRaises(SystemExit) as e:
                 getMergeProposals()
             self.assertIn(error_message, stderr.getvalue())
-            self.assertEquals(2, e.exception.code)
+            self.assertEqual(2, e.exception.code)
 
     def test_no_mp_found_one_branch(self):
         """One branch specified with no MPs found."""
@@ -49,7 +49,7 @@ class TestGetMergeProposal(unittest.TestCase):
                 as get_merge_proposals:
             get_merge_proposals.return_value = []
             count = getMergeProposals()
-            self.assertEquals(0, count)
+            self.assertEqual(0, count)
 
     def test_no_mp_found_multiple_branches(self):
         """Muiltipe branches specified with no MPs found."""
@@ -63,7 +63,7 @@ class TestGetMergeProposal(unittest.TestCase):
                 as get_merge_proposals:
             get_merge_proposals.return_value = []
             count = getMergeProposals()
-            self.assertEquals(0, count)
+            self.assertEqual(0, count)
 
     def test_mp_found_one_branch(self):
         """One branch specified with one MP found."""
@@ -75,7 +75,7 @@ class TestGetMergeProposal(unittest.TestCase):
                 as get_merge_proposals:
             get_merge_proposals.return_value = ['Launchpad_mp']
             count = getMergeProposals()
-            self.assertEquals(1, count)
+            self.assertEqual(1, count)
 
     def test_mp_found_multiple_branches(self):
         """One branch specified with multiple MPs found."""
@@ -89,4 +89,4 @@ class TestGetMergeProposal(unittest.TestCase):
                                                 'Launchpad_mp2',
                                                 'Launchpad_mp3']
             count = getMergeProposals()
-            self.assertEquals(3, count)
+            self.assertEqual(3, count)
diff --git a/tests/test_jenkinsutils.py b/tests/test_jenkinsutils.py
index d0a6d9b..8c7bd85 100644
--- a/tests/test_jenkinsutils.py
+++ b/tests/test_jenkinsutils.py
@@ -1,4 +1,4 @@
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from jlp import jenkinsutils, launchpadutils, _config
 import unittest
 from tests import JenkinsJSONData
@@ -222,7 +222,7 @@ class TestIsJobOrDownstreamBuildingScenarios(TestWithScenarios):
         jenkins.get_json_data = lambda x, append_api=True: self.jenkins_data
         with patch('jlp.jenkinsutils.get_json_jenkins',
                    new=MagicMock(return_value=jenkins)):
-            self.assertEquals(
+            self.assertEqual(
                 jenkinsutils.is_job_or_downstream_building(
                     'job', self.job_params),
                 self.expected)
@@ -330,7 +330,7 @@ class TestGetRunningBuilds(TestWithScenarios):
         jenkins.get_json_data = lambda x, append_api=True: self.jenkins_data
         with patch('jlp.jenkinsutils.get_json_jenkins',
                    new=MagicMock(return_value=jenkins)):
-            self.assertEquals(
+            self.assertEqual(
                 jenkinsutils.get_running_builds('job', self.job_params),
                 self.expected)
 
@@ -494,7 +494,7 @@ class TestIsJobQueued(TestWithScenarios):
             upstream_params = self.upstream_params
         else:
             upstream_params = {}
-        self.assertEquals(
+        self.assertEqual(
             jenkinsutils.is_job_queued(
                 'job', queue=self.queue, job_params=self.job_params,
                 upstream_job=self.upstream_job,
@@ -508,7 +508,7 @@ class TestGetBuildActions(unittest.TestCase):
         json_jenkins = MagicMock()
         json_jenkins.get_json_data.return_value = {}
         get_json_jenkins.return_value = json_jenkins
-        self.assertEquals(jenkinsutils._get_build_actions('job', 23),
+        self.assertEqual(jenkinsutils._get_build_actions('job', 23),
                           [])
 
     @patch('jlp.jenkinsutils.get_json_jenkins')
@@ -554,7 +554,7 @@ class JenkinsUtilsGetDownstreamBuilds(unittest.TestCase):
                                                  'http://ip:8080/job/',
                                                  'my-job',
                                                  3, 11)
-        self.assertEquals(ret, [])
+        self.assertEqual(ret, [])
 
     def test_filter_intermediate_job(self):
         blacklist = lambda name: ['job-freestyle']
@@ -675,11 +675,11 @@ class JenkinsUtilsGetExecutedBuilds(unittest.TestCase):
     def test_get_executed_builds(self):
         ret = jenkinsutils.get_executed_builds(self.jenkins, self.build_url)
         expected = [
-            {'output': 'http://10.0.0.1:8080/job/job-multiconfig/.' +
-                       '/distribution=raring,flavor=amd64/3/console',
+            {'output': 'http://10.0.0.1:8080/job/job-multiconfig/' +
+                       'distribution=raring,flavor=amd64/3/console',
              'result': 'FAILURE', },
-            {'output': 'http://10.0.0.1:8080/job/job-multiconfig/.' +
-                       '/distribution=raring,flavor=i386/3/console',
+            {'output': 'http://10.0.0.1:8080/job/job-multiconfig/' +
+                       'distribution=raring,flavor=i386/3/console',
              'result': 'FAILURE', },
             {'output': 'http://10.0.0.1:8080/job/job-freestyle/7/console',
              'result': u'SUCCESS', },
@@ -702,10 +702,10 @@ class JenkinsUtilsGetExecutedTestRuns(unittest.TestCase):
             self.jenkins,
             'http://10.0.0.1:8080/job/job-multiconfig/' +
             './distribution=raring,flavor=amd64/3/')
-        expected = ['http://10.0.0.1:8080/job/job-multiconfig/./' +
+        expected = ['http://10.0.0.1:8080/job/job-multiconfig/' +
                     'distribution=raring,flavor=amd64/3/artifact/' +
                     'results/coverity/CID_10895.html',
-                    'http://10.0.0.1:8080/job/job-multiconfig/./' +
+                    'http://10.0.0.1:8080/job/job-multiconfig/' +
                     'distribution=raring,flavor=amd64/3/artifact/results' +
                     '/coverity/CID_10896.html']
         self.assertEqual(ret, expected)
@@ -1258,10 +1258,7 @@ class TestTriggerAl(unittest.TestCase):
                                       [MagicMock(), MagicMock(), MagicMock()],
                                       'job', 'url', None)
         self.assertEqual(start_jenkins_job.call_count, 0)
-        # the new vote is the 5th argument in change_mp_status (and we count
-        # from 0)
-        new_vote_position = 4
-        self.assertEqual(report_to_launchpad.call_args[0][new_vote_position],
+        self.assertEqual(report_to_launchpad.call_args[1]['vote'],
                          launchpadutils.LaunchpadVote.NEEDS_FIXING)
 
     @patch('jlp.launchpadutils.is_commit_message_set',
diff --git a/tests/test_jlp.py b/tests/test_jlp.py
index f46eb7c..651d1bc 100644
--- a/tests/test_jlp.py
+++ b/tests/test_jlp.py
@@ -2,7 +2,7 @@ from unittest import TestCase
 import jlp
 from jlp import (get_json_jenkins, load_config, get_config_option,
                  set_log_level)
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import logging
 
 
@@ -24,7 +24,7 @@ class TestGetJsonJenkins(TestCase):
         """Existing JSONJenkins class must be returned when calling
         get_json_jenkins 2+ time"""
         ret = get_json_jenkins()
-        self.assertEquals(ret, self.json_jenkins)
+        self.assertEqual(ret, self.json_jenkins)
 
     @patch('jlp.load_config')
     def test_get_json_replace_no_url(self, load_config):
@@ -37,7 +37,7 @@ class TestGetJsonJenkins(TestCase):
         }
         json_jenkins = get_json_jenkins()
         url = json_jenkins.patch_url('https://proxy/job/my-job')
-        self.assertEquals(url, 'https://proxy/job/my-job')
+        self.assertEqual(url, 'https://proxy/job/my-job')
 
     @patch('jlp.load_config')
     def test_get_json_replace_no_proxy_url(self, load_config):
@@ -50,7 +50,7 @@ class TestGetJsonJenkins(TestCase):
         }
         json_jenkins = get_json_jenkins()
         url = json_jenkins.patch_url('https://proxy/subdir/job/my-job')
-        self.assertEquals(url, 'https://proxy/subdir/job/my-job')
+        self.assertEqual(url, 'https://proxy/subdir/job/my-job')
 
     @patch('jlp.load_config')
     def test_get_json_replace_proxy_url(self, load_config):
@@ -64,7 +64,7 @@ class TestGetJsonJenkins(TestCase):
         }
         json_jenkins = get_json_jenkins()
         url = json_jenkins.patch_url('https://proxy/subdir/job/my-job')
-        self.assertEquals(url, 'http://backend:8080/subdir/job/my-job')
+        self.assertEqual(url, 'http://backend:8080/subdir/job/my-job')
 
     @patch('jlp._json_jenkins', new=None)
     @patch('jlp.JSONJenkins')
@@ -72,34 +72,34 @@ class TestGetJsonJenkins(TestCase):
         """Test that json_jenkins is returned when get_json_jenkins is called
         for the first time"""
         ret = get_json_jenkins()
-        self.assertEquals(json_jenkins.call_count, 1)
+        self.assertEqual(json_jenkins.call_count, 1)
         self.assertIsNotNone(ret)
 
     @patch('jlp._config', new=config)
     @patch('jlp.yaml.safe_load')
     def test_load_config_subsequent_time(self, safe_load):
         ret = load_config()
-        self.assertEquals(safe_load.call_count, 0)
-        self.assertEquals(ret, self.config)
+        self.assertEqual(safe_load.call_count, 0)
+        self.assertEqual(ret, self.config)
 
     @patch('jlp._config', new=None)
-    @patch('__builtin__.open')
+    @patch('builtins.open')
     @patch('jlp.yaml.safe_load')
     def test_load_config_from_home_first_time(self, safe_load, open_mock):
         ret = load_config()
-        self.assertEquals(safe_load.call_count, 1)
+        self.assertEqual(safe_load.call_count, 1)
         self.assertIsNotNone(ret)
 
     @patch('jlp._config', new=None)
-    @patch('__builtin__.open', new=custom_open)
+    @patch('builtins.open', new=custom_open)
     @patch('jlp.yaml.safe_load')
     def test_load_config_from_cwd_first_time(self, safe_load):
         ret = load_config()
         self.assertIsNotNone(ret)
-        self.assertEquals(safe_load.call_count, 1)
+        self.assertEqual(safe_load.call_count, 1)
 
     @patch('jlp._config', new=None)
-    @patch('__builtin__.open')
+    @patch('builtins.open')
     def test_no_config_found(self, open_mock):
         """If no config is found jlp should sys.exit with 1"""
         open_mock.side_effect = IOError()
@@ -107,7 +107,7 @@ class TestGetJsonJenkins(TestCase):
         try:
             load_config()
         except SystemExit as e:
-            self.assertEquals(e.code, 1)
+            self.assertEqual(e.code, 1)
             systemExit = True
         self.assertTrue(systemExit)
 
@@ -116,7 +116,7 @@ class TestGetJsonJenkins(TestCase):
         """get_config_option must return the right value for a defined
         option"""
         value = get_config_option('my_option')
-        self.assertEquals(value, 'my_value')
+        self.assertEqual(value, 'my_value')
 
     @patch('jlp.load_config', new=lambda: {'my_option': 'my_value'})
     def test_get_invalid_config_option(self):
diff --git a/tests/test_launchpadTrigger.py b/tests/test_launchpadTrigger.py
index 6e01673..78075e1 100644
--- a/tests/test_launchpadTrigger.py
+++ b/tests/test_launchpadTrigger.py
@@ -1,5 +1,5 @@
 import unittest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import tests.util as util
 from jlp.commands.launchpadTrigger import launchpadTrigger, trigger_jenkins
 from jlp import get_config_option
@@ -57,7 +57,8 @@ class TestLaunchpadTriggerParams(PatchedLaunchpadTriggerTest):
                     "-a",
                     "--job=faux-dbus-test-runner",
                     "--autoland"]
-        error_message = "error: argument -b/--branch is required"
+        error_message = ("error: the following arguments are required: "
+                         "-b/--branch")
         with patch('sys.argv', sys_argv), \
                 util.captured_stderr() as stderr:
             try:
@@ -74,7 +75,7 @@ class TestLaunchpadTriggerParams(PatchedLaunchpadTriggerTest):
                     "-n",
                     "--branch=lp:faux-dbus-test-runner",
                     "--autoland"]
-        error_message = 'argument -j/--job is required'
+        error_message = 'error: the following arguments are required: -j/--job'
         with patch('sys.argv', sys_argv), \
                 util.captured_stderr() as stderr:
             try:
@@ -154,7 +155,7 @@ class TestLaunchpadTriggerParams(PatchedLaunchpadTriggerTest):
              patch('jlp.commands.launchpadTrigger.get_merge_proposals') as \
                 get_merge_proposals, \
                 patch('jlp.commands.launchpadTrigger.jenkinsutils.' +
-                              'trigger_ci_build') as trigger_ci_build:
+                      'trigger_ci_build'):
             get_merge_proposals.return_value = [self.merge_proposal]
             launchpadTrigger()
             get_merge_proposals.assert_called_with(self.launchpad,
diff --git a/tests/test_launchpadutils.py b/tests/test_launchpadutils.py
index 19febf2..cdb5b10 100644
--- a/tests/test_launchpadutils.py
+++ b/tests/test_launchpadutils.py
@@ -1,8 +1,7 @@
 import unittest
 from jlp import launchpadutils, get_config_option
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from testscenarios import TestWithScenarios
-from textwrap import dedent
 
 
 class LaunchpadUtilsTests(unittest.TestCase):
@@ -104,7 +103,7 @@ class LaunchpadUtilsTests(unittest.TestCase):
             vote.comment.vote = 'Approve'
         reviews = launchpadutils.get_reviews(mp)
         for review in reviews:
-            self.assertEquals(review, 'jenkins;Approve')
+            self.assertEqual(review, 'jenkins;Approve')
 
     def test_unapproved_prerequisite_no_prerequisite(self):
         mp = MagicMock()
@@ -651,13 +650,13 @@ class TestGetGitMergeProposals(unittest.TestCase):
     def test_get_git_merge_proposals_with_wrong_launchpad_version(self):
         launchpad = self._get_launchpad_without_git()
         with self.assertRaises(RuntimeError):
-            ret = launchpadutils.get_merge_proposals(launchpad, '', '',
+            launchpadutils.get_merge_proposals(launchpad, '', '',
                                                      repo_type='git')
 
     def test_invalid_repo_type(self):
         launchpad = self._get_launchpad(None)
         with self.assertRaises(RuntimeError):
-            ret = launchpadutils.get_merge_proposals(launchpad, '', '',
+            launchpadutils.get_merge_proposals(launchpad, '', '',
                                                      repo_type='test')
 
 class TestGetMpHandleFromURL(unittest.TestCase):
@@ -666,7 +665,7 @@ class TestGetMpHandleFromURL(unittest.TestCase):
         """If there is no way how to get branch link from the merge proposal
         url then get_mp_handle_from_url must return None"""
         ret = launchpadutils.get_mp_handle_from_url(MagicMock(), 'http://')
-        self.assertEquals(ret, None)
+        self.assertEqual(ret, None)
 
     @patch("jlp.launchpadutils.get_branch_from_mp", new=lambda x: 'http://')
     def test_unable_to_get_branch_handle(self):
@@ -675,7 +674,7 @@ class TestGetMpHandleFromURL(unittest.TestCase):
         launchpad = MagicMock()
         launchpad.branches.getByUrl = lambda url: None
         ret = launchpadutils.get_mp_handle_from_url(launchpad, 'http://')
-        self.assertEquals(ret, None)
+        self.assertEqual(ret, None)
 
     @patch("jlp.launchpadutils.get_branch_from_mp", new=lambda x: 'http://')
     def test_get_mp_handle_from_url(self):
@@ -691,7 +690,7 @@ class TestGetMpHandleFromURL(unittest.TestCase):
         branch.landing_targets = [mp]
         launchpad.branches.getByUrl = lambda url: branch
         ret = launchpadutils.get_mp_handle_from_url(launchpad, mp_url)
-        self.assertEquals(ret, mp)
+        self.assertEqual(ret, mp)
 
     def test_call_git_api_for_git_url(self):
         """If there is a merge proposal for the given merge proposal URL then
@@ -706,7 +705,7 @@ class TestGetMpHandleFromURL(unittest.TestCase):
         git_repo.landing_targets = [mp]
         launchpad.git_repositories.getByPath = lambda path: git_repo
         ret = launchpadutils.get_mp_handle_from_url(launchpad, mp_url)
-        self.assertEquals(ret, mp)
+        self.assertEqual(ret, mp)
 
 class TestGetBranchHandle(unittest.TestCase):
     def setUp(self):
@@ -807,7 +806,7 @@ class TestGetBranchHandle(unittest.TestCase):
         name = 'lp:dummy'
         # Create multiple matches to be returned for the url
         branch = self.create_fake_bazaar_branch()
-        repo = self.create_fake_git_repo()
+        self.create_fake_git_repo()
         result = launchpadutils.get_branch_handle_for(self.launchpad, name,
                                                       'bazaar');
         self.assertEqual(result, ('bazaar', branch))
@@ -818,7 +817,7 @@ class TestGetBranchHandle(unittest.TestCase):
         '''
         name = 'lp:dummy'
         # Create multiple matches to be returned for the url
-        branch = self.create_fake_bazaar_branch()
+        self.create_fake_bazaar_branch()
         repo = self.create_fake_git_repo()
         result = launchpadutils.get_branch_handle_for(self.launchpad, name,
                                                       'git');
diff --git a/tests/test_voteOnMergeProposal.py b/tests/test_voteOnMergeProposal.py
index 4f9523c..0378006 100644
--- a/tests/test_voteOnMergeProposal.py
+++ b/tests/test_voteOnMergeProposal.py
@@ -1,5 +1,5 @@
 import unittest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import tests.util as util
 from jlp.commands.voteOnMergeProposal import voteOnMergeProposal
 
@@ -41,13 +41,14 @@ class TestVoteOnMergeProposal(unittest.TestCase):
                     '--branch="lp:~mrazik/faux-dbus-test-runner/yar8"',
                     '--merge-proposal="https://code.launchpad.net/~mrazik/' +
                     'faux-dbus-test-runner/yar8/+merge/106113"']
-        error_message = 'error: argument -u/--build-url is required'
+        error_message = ('error: the following arguments are required: '
+                '-u/--build-url')
         with patch('sys.argv', sys_argv), \
                 util.captured_stderr() as stderr:
             with self.assertRaises(SystemExit) as e:
                 voteOnMergeProposal()
             self.assertTrue(error_message in stderr.getvalue())
-            self.assertEquals(2, e.exception.code)
+            self.assertEqual(2, e.exception.code)
 
     def test_no_revision_specified(self):
         """No revision specified; exit with message."""
@@ -59,13 +60,14 @@ class TestVoteOnMergeProposal(unittest.TestCase):
                     '--branch="lp:~mrazik/faux-dbus-test-runner/yar8"',
                     '--merge-proposal="https://code.launchpad.net/~mrazik/' +
                     'faux-dbus-test-runner/yar8/+merge/106113"']
-        error_message = 'error: argument -r/--revision is required'
+        error_message = ('error: the following arguments are required: '
+                '-r/--revision')
         with patch('sys.argv', sys_argv), \
                 util.captured_stderr() as stderr:
             with self.assertRaises(SystemExit) as e:
                 voteOnMergeProposal()
             self.assertTrue(error_message in stderr.getvalue())
-            self.assertEquals(2, e.exception.code)
+            self.assertEqual(2, e.exception.code)
 
     def test_no_merge_proposal_specified(self):
         """No merge_proposal specified; exit with message."""
@@ -76,13 +78,14 @@ class TestVoteOnMergeProposal(unittest.TestCase):
                     'faux-dbus-test-runner-ci/configure"',
                     '--revision=66',
                     '--branch="lp:~mrazik/faux-dbus-test-runner/yar8"']
-        error_message = 'error: argument -p/--merge-proposal is required'
+        error_message = ('error: the following arguments are required: '
+                '-p/--merge-proposal')
         with patch('sys.argv', sys_argv), \
                 util.captured_stderr() as stderr:
             with self.assertRaises(SystemExit) as e:
                 voteOnMergeProposal()
             self.assertTrue(error_message in stderr.getvalue())
-            self.assertEquals(2, e.exception.code)
+            self.assertEqual(2, e.exception.code)
 
     def test_unknown_merge_proposal(self):
         """The given merge proposal wasn't found; error out with message."""
@@ -108,12 +111,11 @@ class TestVoteOnMergeProposal(unittest.TestCase):
                 pass
             self.assertTrue(error_message in stderr.getvalue())
 
-    @patch('sys.argv')
     @patch('jlp.commands.voteOnMergeProposal.launchpadutils.get_mp_handle_from_url')
     @patch('jlp.launchpadutils.report_to_launchpad')
     @patch('jlp.commands.voteOnMergeProposal.launchpadutils.get_template_args')
     @patch('jlp.commands.voteOnMergeProposal.get_jinja_environment')
-    def test_passed_vote(self, gje, gta, rtl, gmphandle, sys_argv):
+    def test_passed_vote(self, gje, gta, rtl, gmphandle):
         """Vote on a proposal which passed."""
 
         sys_argv = ['voteOnMergeProposal.py',
@@ -130,21 +132,20 @@ class TestVoteOnMergeProposal(unittest.TestCase):
             'result': 'PASSED',
             'revision': '66'
         }
-        ret = voteOnMergeProposal()
+        with patch('sys.argv', sys_argv):
+            ret = voteOnMergeProposal()
         self.assertEqual(ret, 0)
         rtl.assert_called_once()
-        gje.get_template.assert_called_with('ci_test.j2')
+        gje.return_value.get_template.assert_called_with('ci_test.j2')
 
 
-    @patch('sys.argv')
     @patch('jlp.commands.voteOnMergeProposal.launchpadutils.' +\
            'get_mp_handle_from_url')
     @patch('jlp.launchpadutils.report_to_launchpad')
     @patch('jlp.launchpadutils.is_commit_message_set')
     @patch('jlp.commands.voteOnMergeProposal.launchpadutils.get_template_args')
     @patch('jlp.commands.voteOnMergeProposal.get_jinja_environment')
-    def test_no_commit_message_set(self, gje, gta, icms,
-                                   rtl, gmphandle, sys_argv):
+    def test_no_commit_message_set(self, gje, gta, icms, rtl, gmphandle):
         """Vote on a proposal where tests passed but no commit message
            was set."""
 
@@ -167,6 +168,7 @@ class TestVoteOnMergeProposal(unittest.TestCase):
         }
         icms.return_value = False
         
-        ret = voteOnMergeProposal()
+        with patch('sys.argv', sys_argv):
+            ret = voteOnMergeProposal()
         self.assertEqual(ret, 0)
-        gje.get_template.assert_called_with('no_commit.j2')
+        gje.return_value.get_template.assert_called_with('no_commit.j2')
diff --git a/tests/util.py b/tests/util.py
index 4ba80fb..b9bd5c9 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -1,5 +1,5 @@
 import sys
-from StringIO import StringIO
+from io import StringIO
 import contextlib
 
 
diff --git a/voteOnMergeProposal.py b/voteOnMergeProposal.py
 deleted file mode 120000
index ebf0657..0000000
--- a/voteOnMergeProposal.py
+++ /dev/null
@@ -1 +0,0 @@
-scripts/voteOnMergeProposal
 \ No newline at end of file