Merge lp:~cjwatson/launchpad/deprecated-assert-methods-2 into lp:launchpad

[Colin Watson]

Use modern equivalents of various deprecated TestCase.assert* methods.

[Colin Watson (cjwatson)]

This is even longer and less interesting than the previous one (it's mostly mechanical assertEquals → assertEqual).

review: Approve

=== modified file 'lib/lp/answers/browser/tests/test_breadcrumbs.py'
--- lib/lp/answers/browser/tests/test_breadcrumbs.py	2017-10-25 10:02:12 +0000
+++ lib/lp/answers/browser/tests/test_breadcrumbs.py	2018-01-02 16:24:23 +0000
@@ -37,21 +37,21 @@
         crumbs = self.getBreadcrumbsForObject(
             self.product, rootsite='answers')
         last_crumb = crumbs[-1]
-        self.assertEquals(last_crumb.url, self.product_questions_url)
-        self.assertEquals(last_crumb.text, 'Questions')
+        self.assertEqual(last_crumb.url, self.product_questions_url)
+        self.assertEqual(last_crumb.text, 'Questions')
 
     def test_project(self):
         crumbs = self.getBreadcrumbsForObject(
             self.project, rootsite='answers')
         last_crumb = crumbs[-1]
-        self.assertEquals(last_crumb.url, self.project_questions_url)
-        self.assertEquals(last_crumb.text, 'Questions')
+        self.assertEqual(last_crumb.url, self.project_questions_url)
+        self.assertEqual(last_crumb.text, 'Questions')
 
     def test_person(self):
         crumbs = self.getBreadcrumbsForObject(self.person, rootsite='answers')
         last_crumb = crumbs[-1]
-        self.assertEquals(last_crumb.url, self.person_questions_url)
-        self.assertEquals(last_crumb.text, 'Questions')
+        self.assertEqual(last_crumb.url, self.person_questions_url)
+        self.assertEqual(last_crumb.text, 'Questions')
 
 
 class TestAnswersBreadcrumb(BaseBreadcrumbTestCase):
@@ -68,11 +68,11 @@
         self.question_url = canonical_url(self.question, rootsite='answers')
         crumbs = self.getBreadcrumbsForObject(self.question)
         last_crumb = crumbs[-1]
-        self.assertEquals(last_crumb.text, 'Question #%d' % self.question.id)
+        self.assertEqual(last_crumb.text, 'Question #%d' % self.question.id)
 
     def test_faq(self):
         self.faq = self.factory.makeFAQ(target=self.product, title='Seedless')
         self.faq_url = canonical_url(self.faq, rootsite='answers')
         crumbs = self.getBreadcrumbsForObject(self.faq)
         last_crumb = crumbs[-1]
-        self.assertEquals(last_crumb.text, 'FAQ #%d' % self.faq.id)
+        self.assertEqual(last_crumb.text, 'FAQ #%d' % self.faq.id)
 
=== modified file 'lib/lp/answers/tests/test_publisher.py'
--- lib/lp/answers/tests/test_publisher.py	2017-10-25 10:02:12 +0000
+++ lib/lp/answers/tests/test_publisher.py	2018-01-02 16:24:23 +0000
@@ -47,6 +47,6 @@
         # Responses to requests to answers pages have the 'Vary' header set to
         # include Accept-Language.
         request = AnswersBrowserRequest(io.StringIO(''), {})
-        self.assertEquals(
+        self.assertEqual(
             request.response.getHeader('Vary'),
             'Cookie, Authorization, Accept-Language')
 
=== modified file 'lib/lp/answers/tests/test_question_notifications.py'
--- lib/lp/answers/tests/test_question_notifications.py	2017-10-25 10:02:12 +0000
+++ lib/lp/answers/tests/test_question_notifications.py	2018-01-02 16:24:23 +0000
@@ -102,7 +102,7 @@
 
     def test_getSubject(self):
         """getSubject() when there is no message added to the question."""
-        self.assertEquals(
+        self.assertEqual(
             'Re: [Question #1]: Question title',
             self.notification.getSubject())
 
 
=== modified file 'lib/lp/answers/tests/test_question_workflow.py'
--- lib/lp/answers/tests/test_question_workflow.py	2018-01-02 10:54:31 +0000
+++ lib/lp/answers/tests/test_question_workflow.py	2018-01-02 16:24:23 +0000
@@ -242,19 +242,18 @@
         """
         self.assertTrue(verifyObject(IQuestionMessage, message))
 
-        self.assertEquals("Re: Help!", message.subject)
-        self.assertEquals(expected_owner, message.owner)
-        self.assertEquals(expected_action, message.action)
-        self.assertEquals(expected_status, message.new_status)
+        self.assertEqual("Re: Help!", message.subject)
+        self.assertEqual(expected_owner, message.owner)
+        self.assertEqual(expected_action, message.action)
+        self.assertEqual(expected_status, message.new_status)
 
-        self.assertEquals(message, self.question.messages[-1])
-        self.assertEquals(expected_status, self.question.status)
+        self.assertEqual(message, self.question.messages[-1])
+        self.assertEqual(expected_status, self.question.status)
 
         if expected_owner == self.question.owner:
-            self.assertEquals(message.datecreated,
-                              self.question.datelastquery)
+            self.assertEqual(message.datecreated, self.question.datelastquery)
         else:
-            self.assertEquals(
+            self.assertEqual(
                 message.datecreated, self.question.datelastresponse)
 
     def checkTransitionEvents(self, message, edited_fields, status_name):
@@ -487,9 +486,9 @@
             """Check additional attributes set when the owner gives the
             answers.
             """
-            self.assertEquals(None, self.question.answer)
-            self.assertEquals(self.owner, self.question.answerer)
-            self.assertEquals(message.datecreated, self.question.date_solved)
+            self.assertIsNone(self.question.answer)
+            self.assertEqual(self.owner, self.question.answerer)
+            self.assertEqual(message.datecreated, self.question.date_solved)
 
         self._testValidTransition(
             [QuestionStatus.OPEN, QuestionStatus.NEEDSINFO,
@@ -538,7 +537,7 @@
         # changes based on departure state.
         def checkFAQ(message):
             """Check that the FAQ attribute was set correctly."""
-            self.assertEquals(self.question.faq, self.faq)
+            self.assertEqual(self.question.faq, self.faq)
 
         self._testValidTransition(
             [QuestionStatus.OPEN, QuestionStatus.NEEDSINFO,
@@ -559,8 +558,8 @@
             answers.
             """
             checkFAQ(message)
-            self.assertEquals(self.owner, self.question.answerer)
-            self.assertEquals(message.datecreated, self.question.date_solved)
+            self.assertEqual(self.owner, self.question.answerer)
+            self.assertEqual(message.datecreated, self.question.date_solved)
 
         self._testValidTransition(
             [QuestionStatus.OPEN, QuestionStatus.NEEDSINFO,
@@ -642,9 +641,9 @@
 
         def checkAnswerMessage(message):
             # Check the attributes that are set when an answer is confirmed.
-            self.assertEquals(answer_message, self.question.answer)
-            self.assertEquals(self.answerer, self.question.answerer)
-            self.assertEquals(message.datecreated, self.question.date_solved)
+            self.assertEqual(answer_message, self.question.answer)
+            self.assertEqual(self.answerer, self.question.answerer)
+            self.assertEqual(message.datecreated, self.question.date_solved)
 
         self._testValidTransition(
             [QuestionStatus.OPEN, QuestionStatus.NEEDSINFO,
@@ -672,13 +671,13 @@
         self.question.giveAnswer(
             self.owner, 'I solved my own problem.',
             datecreated=self.nowPlus(2))
-        self.assertEquals(self.question.status, QuestionStatus.SOLVED)
+        self.assertEqual(self.question.status, QuestionStatus.SOLVED)
 
         def checkAnswerMessage(message):
             # Check the attributes that are set when an answer is confirmed.
-            self.assertEquals(answer_message, self.question.answer)
-            self.assertEquals(self.answerer, self.question.answerer)
-            self.assertEquals(message.datecreated, self.question.date_solved)
+            self.assertEqual(answer_message, self.question.answer)
+            self.assertEqual(self.answerer, self.question.answerer)
+            self.assertEqual(message.datecreated, self.question.date_solved)
 
         self._testValidTransition(
             [QuestionStatus.SOLVED],
@@ -765,7 +764,7 @@
         self.question.giveAnswer(
             self.owner, 'I solved my own problem.',
             datecreated=self.nowPlus(0))
-        self.assertEquals(self.question.status, QuestionStatus.SOLVED)
+        self.assertEqual(self.question.status, QuestionStatus.SOLVED)
 
         # Clear previous events.
         self.collected_events = []
@@ -793,7 +792,7 @@
             self.answerer, 'Press the any key.', datecreated=self.nowPlus(0))
         self.question.confirmAnswer("That answer worked!.",
             answer=answer_message, datecreated=self.nowPlus(1))
-        self.assertEquals(self.question.status, QuestionStatus.SOLVED)
+        self.assertEqual(self.question.status, QuestionStatus.SOLVED)
 
         # Clear previous events.
         self.collected_events = []
@@ -890,9 +889,9 @@
         def checkRejectMessageIsAnAnswer(message):
             # Check that the rejection message was considered answering
             # the question.
-            self.assertEquals(message, self.question.answer)
-            self.assertEquals(self.answerer, self.question.answerer)
-            self.assertEquals(message.datecreated, self.question.date_solved)
+            self.assertEqual(message, self.question.answer)
+            self.assertEqual(self.answerer, self.question.answerer)
+            self.assertEqual(message.datecreated, self.question.date_solved)
 
         self._testValidTransition(
             valid_statuses,
 
=== modified file 'lib/lp/app/browser/tests/test_inlineeditpickerwidget.py'
--- lib/lp/app/browser/tests/test_inlineeditpickerwidget.py	2015-07-08 16:05:11 +0000
+++ lib/lp/app/browser/tests/test_inlineeditpickerwidget.py	2018-01-02 16:24:23 +0000
@@ -42,7 +42,7 @@
         # Make sure that when given a vocabulary which supports vocab filters,
         # the vocab filters are include in the widget config.
         widget = self.getWidget(vocabulary='ValidPersonOrTeam')
-        self.assertEquals([
+        self.assertEqual([
             {'name': 'ALL',
              'title': 'All',
              'description': 'Display all search results'},
@@ -87,13 +87,13 @@
         # The widget has the correct meta value for a person value.
         widget_value = self.factory.makePerson()
         widget = self.getWidget(widget_value, vocabulary='ValidPersonOrTeam')
-        self.assertEquals('person', widget.config['selected_value_metadata'])
+        self.assertEqual('person', widget.config['selected_value_metadata'])
 
     def test_team_selected_value_meta(self):
         # The widget has the correct meta value for a team value.
         widget_value = self.factory.makeTeam()
         widget = self.getWidget(widget_value, vocabulary='ValidPersonOrTeam')
-        self.assertEquals('team', widget.config['selected_value_metadata'])
+        self.assertEqual('team', widget.config['selected_value_metadata'])
 
     def test_required_fields_dont_have_a_remove_link(self):
         widget = self.getWidget(
 
=== modified file 'lib/lp/app/browser/tests/test_launchpad.py'
--- lib/lp/app/browser/tests/test_launchpad.py	2016-06-20 22:29:24 +0000
+++ lib/lp/app/browser/tests/test_launchpad.py	2018-01-02 16:24:23 +0000
@@ -77,10 +77,10 @@
 
         notifications = request.notifications
         if notification is None:
-            self.assertEquals(len(notifications), 0)
+            self.assertEqual(len(notifications), 0)
             return
         self.assertEqual(len(notifications), 1)
-        self.assertEquals(notifications[0].level, level)
+        self.assertEqual(notifications[0].level, level)
         self.assertEqual(notification, notifications[0].message)
 
     def assertDisplaysNotification(
 
=== modified file 'lib/lp/app/browser/tests/test_launchpadroot.py'
--- lib/lp/app/browser/tests/test_launchpadroot.py	2018-01-02 10:54:31 +0000
+++ lib/lp/app/browser/tests/test_launchpadroot.py	2018-01-02 16:24:23 +0000
@@ -84,7 +84,7 @@
     def test_featured_projects_view_requires_edit(self):
         view = create_view(self.root, '+featuredprojects')
         checker = selectChecker(view)
-        self.assertEquals('launchpad.Edit', checker.permission_id('__call__'))
+        self.assertEqual('launchpad.Edit', checker.permission_id('__call__'))
 
     def test_featured_projects_manage_link_requires_edit(self):
         self.setUpRegistryExpert()
 
=== modified file 'lib/lp/app/tests/test_tales.py'
--- lib/lp/app/tests/test_tales.py	2018-01-02 10:54:31 +0000
+++ lib/lp/app/tests/test_tales.py	2018-01-02 16:24:23 +0000
@@ -395,7 +395,7 @@
         ircID = ircset.new(person, "<b>irc.canonical.com</b>", "fred")
         expected_html = test_tales(
             'nick/fmt:formatted_displayname', nick=ircID)
-        self.assertEquals(
+        self.assertEqual(
             u'<strong>fred</strong>\n'
             '<span class="lesser"> on </span>\n'
             '<strong>&lt;b&gt;irc.canonical.com&lt;/b&gt;</strong>\n',
 
=== modified file 'lib/lp/archivepublisher/tests/test_debversion.py'
--- lib/lp/archivepublisher/tests/test_debversion.py	2018-01-02 10:54:31 +0000
+++ lib/lp/archivepublisher/tests/test_debversion.py	2018-01-02 16:24:23 +0000
@@ -62,15 +62,15 @@
 
     def testReturnString(self):
         """Version should convert to a string."""
-        self.assertEquals(str(Version("1.0")), "1.0")
+        self.assertEqual(str(Version("1.0")), "1.0")
 
     def testAcceptsInteger(self):
         """Version should accept an integer."""
-        self.assertEquals(str(Version(1)), "1")
+        self.assertEqual(str(Version(1)), "1")
 
     def testAcceptsNumber(self):
         """Version should accept a number."""
-        self.assertEquals(str(Version(1.2)), "1.2")
+        self.assertEqual(str(Version(1.2)), "1.2")
 
     def testNotEmpty(self):
         """Version should fail with empty input."""
@@ -107,8 +107,8 @@
     def testRevisionNotEmpty(self):
         """Version should not allow an empty revision."""
         v = Version("1-")
-        self.assertEquals("1-", v.upstream_version)
-        self.assertEquals(None, v.debian_version)
+        self.assertEqual("1-", v.upstream_version)
+        self.assertIsNone(v.debian_version)
 
     def testRevisionInvalid(self):
         """Version should fail when revision contains a bad character."""
@@ -118,7 +118,7 @@
         """Version should give same input as output."""
         for value in self.VALUES:
             result = str(Version(value))
-            self.assertEquals(value, result)
+            self.assertEqual(value, result)
 
     def testComparisons(self):
         """Sample Version comparisons should pass."""
@@ -127,10 +127,10 @@
 
     def testNullEpochIsZero(self):
         """Version should treat an omitted epoch as a zero one."""
-        self.assertEquals(Version("1.0"), Version("0:1.0"))
+        self.assertEqual(Version("1.0"), Version("0:1.0"))
 
     def notestNullRevisionIsZero(self):
         """Version should treat an omitted revision as being equal to zero.
         """
-        self.assertEquals(Version("1.0"), Version("1.0-0"))
+        self.assertEqual(Version("1.0"), Version("1.0-0"))
         self.assertTrue(Version("1.0") == Version("1.0-0"))
 
=== modified file 'lib/lp/archivepublisher/tests/test_htaccess.py'
--- lib/lp/archivepublisher/tests/test_htaccess.py	2017-10-09 11:33:11 +0000
+++ lib/lp/archivepublisher/tests/test_htaccess.py	2018-01-02 16:24:23 +0000
@@ -101,7 +101,7 @@
         # If there are no ArchiveAuthTokens for an archive just
         # the buildd secret is returned.
         self.ppa.buildd_secret = "sekr1t"
-        self.assertEquals(
+        self.assertEqual(
             [("buildd", "sekr1t", "bu")],
             list(htpasswd_credentials_for_archive(self.ppa)))
 
 
=== modified file 'lib/lp/archiveuploader/tests/test_changesfile.py'
--- lib/lp/archiveuploader/tests/test_changesfile.py	2017-09-17 10:35:57 +0000
+++ lib/lp/archiveuploader/tests/test_changesfile.py	2018-01-02 16:24:23 +0000
@@ -50,25 +50,25 @@
 
     def testSourceFile(self):
         # A non-DSC source file is a SourceUploadFile.
-        self.assertEquals(
+        self.assertEqual(
             ('foo', SourceUploadFile),
             determine_file_class_and_name('foo_1.0.diff.gz'))
 
     def testDSCFile(self):
         # A DSC is a DSCFile, since they're special.
-        self.assertEquals(
+        self.assertEqual(
             ('foo', DSCFile),
             determine_file_class_and_name('foo_1.0.dsc'))
 
     def testDEBFile(self):
         # A binary file is the appropriate PackageUploadFile subclass.
-        self.assertEquals(
+        self.assertEqual(
             ('foo', DebBinaryUploadFile),
             determine_file_class_and_name('foo_1.0_all.deb'))
-        self.assertEquals(
+        self.assertEqual(
             ('foo', DdebBinaryUploadFile),
             determine_file_class_and_name('foo_1.0_all.ddeb'))
-        self.assertEquals(
+        self.assertEqual(
             ('foo', UdebBinaryUploadFile),
             determine_file_class_and_name('foo_1.0_all.udeb'))
 
@@ -219,43 +219,43 @@
         # checkFileName() yields an UploadError if the filename is invalid.
         contents = self.getBaseChanges()
         changes = self.createChangesFile("mypkg_0.1_i386.changes", contents)
-        self.assertEquals([], list(changes.checkFileName()))
+        self.assertEqual([], list(changes.checkFileName()))
         changes = self.createChangesFile("mypkg_0.1.changes", contents)
         errors = list(changes.checkFileName())
         self.assertIsInstance(errors[0], UploadError)
-        self.assertEquals(1, len(errors))
+        self.assertEqual(1, len(errors))
 
     def test_filename(self):
         # Filename gets set to the basename of the changes file on disk.
         changes = self.createChangesFile(
             "mypkg_0.1_i386.changes", self.getBaseChanges())
-        self.assertEquals("mypkg_0.1_i386.changes", changes.filename)
+        self.assertEqual("mypkg_0.1_i386.changes", changes.filename)
 
     def test_suite_name(self):
         # The suite name gets extracted from the changes file.
         changes = self.createChangesFile(
             "mypkg_0.1_i386.changes", self.getBaseChanges())
-        self.assertEquals("nifty", changes.suite_name)
+        self.assertEqual("nifty", changes.suite_name)
 
     def test_version(self):
         # The version gets extracted from the changes file.
         changes = self.createChangesFile(
             "mypkg_0.1_i386.changes", self.getBaseChanges())
-        self.assertEquals("0.1", changes.version)
+        self.assertEqual("0.1", changes.version)
 
     def test_architectures(self):
         # The architectures get extracted from the changes file
         # and parsed correctly.
         changes = self.createChangesFile(
             "mypkg_0.1_i386.changes", self.getBaseChanges())
-        self.assertEquals("i386", changes.architecture_line)
-        self.assertEquals(set(["i386"]), changes.architectures)
+        self.assertEqual("i386", changes.architecture_line)
+        self.assertEqual(set(["i386"]), changes.architectures)
 
     def test_source(self):
         # The source package name gets extracted from the changes file.
         changes = self.createChangesFile(
             "mypkg_0.1_i386.changes", self.getBaseChanges())
-        self.assertEquals("mypkg", changes.source)
+        self.assertEqual("mypkg", changes.source)
 
     def test_processAddresses(self):
         # processAddresses parses the changes file and sets the
@@ -263,9 +263,9 @@
         contents = self.getBaseChanges()
         changes = self.createChangesFile(
             "mypkg_0.1_i386.changes", contents)
-        self.assertEquals(None, changes.changed_by)
+        self.assertIsNone(changes.changed_by)
         errors = list(changes.processAddresses())
-        self.assertEquals(0, len(errors), "Errors: %r" % errors)
+        self.assertEqual(0, len(errors), "Errors: %r" % errors)
         self.assertThat(
             changes.changed_by,
             MatchesDict({
@@ -280,8 +280,8 @@
         contents = self.getBaseChanges()
         changes = self.createChangesFile(
             "mypkg_0.1_i386.changes", contents)
-        self.assertEquals([], list(changes.processAddresses()))
-        self.assertEquals(
+        self.assertEqual([], list(changes.processAddresses()))
+        self.assertEqual(
             "Something changed\n\n"
             " -- Somebody <[e-mail]>  "
             "Fri, 25 Jun 2010 11:20:22 -0600",
 
=== modified file 'lib/lp/archiveuploader/tests/test_dscfile.py'
--- lib/lp/archiveuploader/tests/test_dscfile.py	2016-06-01 01:59:32 +0000
+++ lib/lp/archiveuploader/tests/test_dscfile.py	2018-01-02 16:24:23 +0000
@@ -76,7 +76,7 @@
         file.write(copyright)
         file.close()
 
-        self.assertEquals(
+        self.assertEqual(
             copyright, find_copyright(self.tmpdir, DevNullLogger()))
 
     def testBadDebianChangelog(self):
@@ -98,7 +98,7 @@
         file.write(changelog)
         file.close()
 
-        self.assertEquals(
+        self.assertEqual(
             changelog, find_changelog(self.tmpdir, DevNullLogger()))
 
     def testOversizedFile(self):
@@ -252,7 +252,7 @@
             DEBIAN_TARBALL: 0,
             }
         full_files.update(files)
-        self.assertEquals(
+        self.assertEqual(
             expected,
             [str(e) for e in format_to_file_checker_map[self.format](
                 'foo_1.dsc', full_files, components, component_signatures,
@@ -408,7 +408,7 @@
         unpacked_dir = unpack_source(
             datadir(os.path.join('suite', 'bar_1.0-1', 'bar_1.0-1.dsc')))
         try:
-            self.assertEquals(["bar-1.0"], os.listdir(unpacked_dir))
+            self.assertEqual(["bar-1.0"], os.listdir(unpacked_dir))
             self.assertContentEqual(
                 ["THIS_IS_BAR", "debian"],
                 os.listdir(os.path.join(unpacked_dir, "bar-1.0")))
 
=== modified file 'lib/lp/archiveuploader/tests/test_nascentupload.py'
--- lib/lp/archiveuploader/tests/test_nascentupload.py	2014-06-11 08:29:40 +0000
+++ lib/lp/archiveuploader/tests/test_nascentupload.py	2018-01-02 16:24:23 +0000
@@ -52,7 +52,7 @@
         return file
 
     def assertMatchDDEBErrors(self, error_list):
-        self.assertEquals(
+        self.assertEqual(
             error_list, [str(e) for e in self.upload._matchDDEBs()])
 
     def testNoLinksWithNoBinaries(self):
 
=== modified file 'lib/lp/archiveuploader/tests/test_nascentuploadfile.py'
--- lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2016-11-17 16:46:04 +0000
+++ lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2018-01-02 16:24:23 +0000
@@ -124,7 +124,7 @@
         # The mime type gets set according to PackageUploadCustomFormat.
         uploadfile = self.createCustomUploadFile(
             "bla.txt", "data", "main/raw-installer", "extra")
-        self.assertEquals(
+        self.assertEqual(
             PackageUploadCustomFormat.DEBIAN_INSTALLER,
             uploadfile.custom_type)
 
@@ -132,10 +132,10 @@
         # storeInDatabase creates a library file.
         uploadfile = self.createCustomUploadFile(
             "bla.txt", "data", "main/raw-installer", "extra")
-        self.assertEquals("application/octet-stream", uploadfile.content_type)
+        self.assertEqual("application/octet-stream", uploadfile.content_type)
         libraryfile = uploadfile.storeInDatabase()
-        self.assertEquals("bla.txt", libraryfile.filename)
-        self.assertEquals("application/octet-stream", libraryfile.mimetype)
+        self.assertEqual("bla.txt", libraryfile.filename)
+        self.assertEqual("application/octet-stream", libraryfile.mimetype)
 
     def test_debian_installer_verify(self):
         # debian-installer uploads are required to have sensible filenames.
@@ -236,7 +236,7 @@
                       priority_name, package, version, changes):
         (path, md5, sha1, size) = self.writeUploadFile(filename, dsc.dump())
         if changes:
-            self.assertEquals([], list(changes.processAddresses()))
+            self.assertEqual([], list(changes.processAddresses()))
         return DSCFile(
             path, dict(MD5=md5), size, component_and_section, priority_name,
             package, version, changes, self.policy, self.logger)
@@ -246,7 +246,7 @@
         dsc = self.getBaseDsc()
         uploadfile = self.createDSCFile(
             "foo.dsc", dsc, "main/net", "extra", "dulwich", "0.42", None)
-        self.assertEquals(
+        self.assertEqual(
             "text/x-debian-source-package", uploadfile.content_type)
 
     def test_storeInDatabase(self):
@@ -260,8 +260,8 @@
         uploadfile.changelog = "DUMMY"
         uploadfile.files = []
         release = uploadfile.storeInDatabase(None)
-        self.assertEquals("0.42", release.version)
-        self.assertEquals("dpkg, bzr", release.builddepends)
+        self.assertEqual("0.42", release.version)
+        self.assertEqual("dpkg, bzr", release.builddepends)
 
     def test_storeInDatabase_case_sensitivity(self):
         # storeInDatabase supports field names with different cases,
@@ -275,7 +275,7 @@
         uploadfile.files = []
         uploadfile.changelog = "DUMMY"
         release = uploadfile.storeInDatabase(None)
-        self.assertEquals("dpkg, bzr", release.builddepends)
+        self.assertEqual("dpkg, bzr", release.builddepends)
 
     def test_user_defined_fields(self):
         # storeInDatabase updates user_defined_fields.
@@ -289,7 +289,7 @@
         uploadfile.files = []
         release = uploadfile.storeInDatabase(None)
         # DSCFile lowercases the field names
-        self.assertEquals(
+        self.assertEqual(
             [["Python-Version", u"2.5"]], release.user_defined_fields)
 
     def test_homepage(self):
@@ -303,7 +303,7 @@
         uploadfile.changelog = "DUMMY"
         uploadfile.files = []
         release = uploadfile.storeInDatabase(None)
-        self.assertEquals(u"http://samba.org/~jelmer/bzr", release.homepage)
+        self.assertEqual(u"http://samba.org/~jelmer/bzr", release.homepage)
 
     def test_checkBuild(self):
         # checkBuild() verifies consistency with a build.
@@ -320,7 +320,7 @@
         uploadfile.checkBuild(build)
         # checkBuild() sets the build status to FULLYBUILT and
         # removes the upload log.
-        self.assertEquals(BuildStatus.FULLYBUILT, build.status)
+        self.assertEqual(BuildStatus.FULLYBUILT, build.status)
         self.assertIs(None, build.upload_log)
 
     def test_checkBuild_inconsistent(self):
@@ -399,7 +399,7 @@
         # Unknown priorities automatically get changed to 'extra'.
         uploadfile = self.createDebBinaryUploadFile(
             "foo_0.42_i386.deb", "main/net", "unknown", "mypkg", "0.42", None)
-        self.assertEquals("extra", uploadfile.priority_name)
+        self.assertEqual("extra", uploadfile.priority_name)
 
     def test_parseControl(self):
         # parseControl sets various fields on DebBinaryUploadFile.
@@ -408,10 +408,10 @@
             None)
         control = self.getBaseControl()
         uploadfile.parseControl(control)
-        self.assertEquals("python", uploadfile.section_name)
-        self.assertEquals("dulwich", uploadfile.source_name)
-        self.assertEquals("0.42", uploadfile.source_version)
-        self.assertEquals("0.42", uploadfile.control_version)
+        self.assertEqual("python", uploadfile.section_name)
+        self.assertEqual("dulwich", uploadfile.source_name)
+        self.assertEqual("0.42", uploadfile.source_version)
+        self.assertEqual("0.42", uploadfile.control_version)
 
     def test_verifyFormat_control_xz(self):
         # verifyFormat accepts .debs with an xz-compressed control member.
@@ -452,15 +452,15 @@
         uploadfile.parseControl(control)
         build = self.factory.makeBinaryPackageBuild()
         bpr = uploadfile.storeInDatabase(build)
-        self.assertEquals(u'python (<< 2.7), python (>= 2.5)', bpr.depends)
-        self.assertEquals(
+        self.assertEqual(u'python (<< 2.7), python (>= 2.5)', bpr.depends)
+        self.assertEqual(
             u"Dulwich is a Python implementation of the file formats "
             u"and protocols", bpr.description)
-        self.assertEquals(False, bpr.essential)
-        self.assertEquals(524, bpr.installedsize)
-        self.assertEquals(True, bpr.architecturespecific)
-        self.assertEquals(u"", bpr.recommends)
-        self.assertEquals("0.42", bpr.version)
+        self.assertEqual(False, bpr.essential)
+        self.assertEqual(524, bpr.installedsize)
+        self.assertEqual(True, bpr.architecturespecific)
+        self.assertEqual(u"", bpr.recommends)
+        self.assertEqual("0.42", bpr.version)
 
     def test_user_defined_fields(self):
         # storeInDatabase stores user defined fields.
@@ -472,7 +472,7 @@
         uploadfile.parseControl(control)
         build = self.factory.makeBinaryPackageBuild()
         bpr = uploadfile.storeInDatabase(build)
-        self.assertEquals(
+        self.assertEqual(
             [[u"Python-Version", u"2.5"]], bpr.user_defined_fields)
 
     def test_user_defined_fields_newlines(self):
@@ -485,7 +485,7 @@
         uploadfile.parseControl(control)
         build = self.factory.makeBinaryPackageBuild()
         bpr = uploadfile.storeInDatabase(build)
-        self.assertEquals(
+        self.assertEqual(
             [
                 [u"RandomData", u"Foo\nbar\nbla\n"],
             ], bpr.user_defined_fields)
@@ -500,7 +500,7 @@
         uploadfile.parseControl(control)
         build = self.factory.makeBinaryPackageBuild()
         bpr = uploadfile.storeInDatabase(build)
-        self.assertEquals(
+        self.assertEqual(
             u"http://samba.org/~jelmer/dulwich", bpr.homepage)
 
     def test_checkBuild(self):
@@ -516,7 +516,7 @@
         uploadfile.checkBuild(build)
         # checkBuild() sets the build status to FULLYBUILT and
         # removes the upload log.
-        self.assertEquals(BuildStatus.FULLYBUILT, build.status)
+        self.assertEqual(BuildStatus.FULLYBUILT, build.status)
         self.assertIs(None, build.upload_log)
 
     def test_checkBuild_inconsistent(self):
@@ -549,7 +549,7 @@
         control = self.getBaseControl()
         control["Source"] = "foo"
         uploadfile.parseControl(control)
-        self.assertEquals(
+        self.assertEqual(
             spph.sourcepackagerelease, uploadfile.findSourcePackageRelease())
 
     def test_findSourcePackageRelease_no_spph(self):
@@ -594,5 +594,5 @@
         control = self.getBaseControl()
         control["Source"] = "foo"
         uploadfile.parseControl(control)
-        self.assertEquals(
+        self.assertEqual(
             spph2.sourcepackagerelease, uploadfile.findSourcePackageRelease())
 
=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2016-07-02 07:55:26 +0000
+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2018-01-02 16:24:23 +0000
@@ -1146,7 +1146,7 @@
         # primary archive.
         upload_dir = self.queueUpload(
             "bar_1.0-2_3.0-quilt_without_orig", "~name16/ubuntu")
-        self.assertEquals(
+        self.assertEqual(
             self.processUpload(self.uploadprocessor, upload_dir),
             ['accepted'])
 
 
=== modified file 'lib/lp/archiveuploader/tests/test_recipeuploads.py'
--- lib/lp/archiveuploader/tests/test_recipeuploads.py	2015-04-20 15:59:52 +0000
+++ lib/lp/archiveuploader/tests/test_recipeuploads.py	2018-01-02 16:24:23 +0000
@@ -60,7 +60,7 @@
             '%d/ubuntu/bar_1.0-1_source.changes' % self.build.archive.id)
         self.layer.txn.commit()
 
-        self.assertEquals(UploadStatusEnum.ACCEPTED, result,
+        self.assertEqual(UploadStatusEnum.ACCEPTED, result,
             "Source upload failed\nGot: %s" % self.log.getLogBuffer())
 
         self.assertEqual(BuildStatus.FULLYBUILT, self.build.status)
 
=== modified file 'lib/lp/archiveuploader/tests/test_uploadpolicy.py'
--- lib/lp/archiveuploader/tests/test_uploadpolicy.py	2017-05-02 23:02:41 +0000
+++ lib/lp/archiveuploader/tests/test_uploadpolicy.py	2018-01-02 16:24:23 +0000
@@ -70,7 +70,7 @@
 
         policy.validateUploadType(upload)
 
-        self.assertEquals([], upload.rejections)
+        self.assertEqual([], upload.rejections)
 
     def test_binaryful_accepted(self):
         policy = make_policy(accepted_type=ArchiveUploadType.BINARY_ONLY)
@@ -78,7 +78,7 @@
 
         policy.validateUploadType(upload)
 
-        self.assertEquals([], upload.rejections)
+        self.assertEqual([], upload.rejections)
 
     def test_mixed_accepted(self):
         policy = make_policy(accepted_type=ArchiveUploadType.MIXED_ONLY)
@@ -86,7 +86,7 @@
 
         policy.validateUploadType(upload)
 
-        self.assertEquals([], upload.rejections)
+        self.assertEqual([], upload.rejections)
 
     def test_sourceful_not_accepted(self):
         policy = make_policy(accepted_type=ArchiveUploadType.BINARY_ONLY)
 
=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2017-09-17 10:35:57 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2018-01-02 16:24:23 +0000
@@ -1778,7 +1778,7 @@
             "rejected" in str(msg), "Failed to upload bar source:\n%s" % msg)
         spph = self.publishPackage("bar", "1.0-1")
 
-        self.assertEquals(
+        self.assertEqual(
             sorted((sprf.libraryfile.filename, sprf.filetype)
                    for sprf in spph.sourcepackagerelease.files),
             [('bar_1.0-1.debian.tar.bz2',
@@ -1819,11 +1819,11 @@
 
         # Upload another source sharing the same (component) orig.
         upload_dir = self.queueUpload("bar_1.0-2_3.0-quilt_without_orig")
-        self.assertEquals(
+        self.assertEqual(
             self.processUpload(uploadprocessor, upload_dir), ['accepted'])
 
         queue_item = uploadprocessor.last_processed_upload.queue_root
-        self.assertEquals(
+        self.assertEqual(
             sorted((sprf.libraryfile.filename, sprf.filetype) for sprf
                    in queue_item.sources[0].sourcepackagerelease.files),
             [('bar_1.0-2.debian.tar.bz2',
@@ -1859,7 +1859,7 @@
             "rejected" in str(msg), "Failed to upload bar source:\n%s" % msg)
         spph = self.publishPackage("bar", "1.0")
 
-        self.assertEquals(
+        self.assertEqual(
             sorted((sprf.libraryfile.filename, sprf.filetype)
                    for sprf in spph.sourcepackagerelease.files),
             [('bar_1.0.dsc',
@@ -2194,10 +2194,9 @@
         self.options.builds = True
         BuildUploadHandler(self.uploadprocessor, self.incoming_folder,
             leaf_name).process()
-        self.assertEquals(1, len(self.oopses))
-        self.assertEquals(
-            BuildStatus.FAILEDTOUPLOAD, build.status)
-        self.assertEquals(builder, build.builder)
+        self.assertEqual(1, len(self.oopses))
+        self.assertEqual(BuildStatus.FAILEDTOUPLOAD, build.status)
+        self.assertEqual(builder, build.builder)
         self.assertIsNot(None, build.duration)
         log_contents = build.upload_log.read()
         self.assertTrue('ERROR Exception while processing upload '
@@ -2254,7 +2253,7 @@
         build = self.factory.makeSourcePackageRecipeBuild(sourcename=u"bar",
             distroseries=self.breezy, archive=archive,
             requester=archive.owner)
-        self.assertEquals(archive.owner, build.requester)
+        self.assertEqual(archive.owner, build.requester)
         self.switchToUploader()
         # Commit so the build cookie has the right ids.
         self.layer.txn.commit()
@@ -2279,8 +2278,8 @@
         # Properly uploaded source packages should result in the
         # build status changing to FULLYBUILT.
         build = self.doSuccessRecipeBuild()
-        self.assertEquals(BuildStatus.FULLYBUILT, build.status)
-        self.assertEquals(None, build.builder)
+        self.assertEqual(BuildStatus.FULLYBUILT, build.status)
+        self.assertIsNone(build.builder)
         self.assertIsNot(None, build.duration)
         # Upon full build the upload log is unset.
         self.assertIs(None, build.upload_log)
@@ -2319,8 +2318,8 @@
 
     def testSourcePackageRecipeBuild_fail(self):
         build = self.doFailureRecipeBuild()
-        self.assertEquals(BuildStatus.FAILEDTOUPLOAD, build.status)
-        self.assertEquals(None, build.builder)
+        self.assertEqual(BuildStatus.FAILEDTOUPLOAD, build.status)
+        self.assertIsNone(build.builder)
         self.assertIsNot(None, build.duration)
         self.assertIsNot(None, build.upload_log)
 
@@ -2366,8 +2365,8 @@
 
     def testSourcePackageRecipeBuild_deleted_recipe(self):
         build = self.doDeletedRecipeBuild()
-        self.assertEquals(BuildStatus.FAILEDTOUPLOAD, build.status)
-        self.assertEquals(None, build.builder)
+        self.assertEqual(BuildStatus.FAILEDTOUPLOAD, build.status)
+        self.assertIsNone(build.builder)
         self.assertIsNot(None, build.duration)
         self.assertIs(None, build.upload_log)
 
@@ -2437,7 +2436,7 @@
         # The build status is not changed
         self.assertTrue(
             os.path.exists(os.path.join(self.incoming_folder, leaf_name)))
-        self.assertEquals(BuildStatus.BUILDING, build.status)
+        self.assertEqual(BuildStatus.BUILDING, build.status)
         self.assertLogContains("Build status is BUILDING. Ignoring.")
 
     def testBuildWithInvalidStatus(self):
@@ -2451,7 +2450,7 @@
             os.path.exists(os.path.join(self.incoming_folder, leaf_name)))
         self.assertTrue(
             os.path.exists(os.path.join(self.failed_folder, leaf_name)))
-        self.assertEquals(BuildStatus.NEEDSBUILD, build.status)
+        self.assertEqual(BuildStatus.NEEDSBUILD, build.status)
         self.assertLogContains(
             "Expected build status to be UPLOADING or BUILDING, was "
             "NEEDSBUILD.")
@@ -2486,7 +2485,7 @@
     """Tests for parse_build_upload_leaf_name."""
 
     def test_valid(self):
-        self.assertEquals(
+        self.assertEqual(
             ('PACKAGEBUILD', 60),
             parse_build_upload_leaf_name("20100812-PACKAGEBUILD-60"))
 
 
=== modified file 'lib/lp/archiveuploader/tests/test_utils.py'
--- lib/lp/archiveuploader/tests/test_utils.py	2016-06-01 01:59:32 +0000
+++ lib/lp/archiveuploader/tests/test_utils.py	2018-01-02 16:24:23 +0000
@@ -30,116 +30,116 @@
         """lp.archiveuploader.utils.determine_source_file_type should work."""
 
         # .dsc -> DSC
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0-1.dsc'),
             SourcePackageFileType.DSC)
 
         # .diff.gz -> DIFF
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0-1.diff.gz'),
             SourcePackageFileType.DIFF)
 
         # DIFFs can only be gzipped.
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.diff.bz2'), None)
 
         # Plain original tarballs can be gzipped or bzip2ed.
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig.tar.gz'),
             SourcePackageFileType.ORIG_TARBALL)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig.tar.bz2'),
             SourcePackageFileType.ORIG_TARBALL)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig.tar.xz'),
             SourcePackageFileType.ORIG_TARBALL)
 
         # Component original tarballs too.
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig-foo.tar.gz'),
             SourcePackageFileType.COMPONENT_ORIG_TARBALL)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig-bar.tar.bz2'),
             SourcePackageFileType.COMPONENT_ORIG_TARBALL)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig-bar.tar.xz'),
             SourcePackageFileType.COMPONENT_ORIG_TARBALL)
 
         # And Debian tarballs...
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0-1.debian.tar.gz'),
             SourcePackageFileType.DEBIAN_TARBALL)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0-2.debian.tar.bz2'),
             SourcePackageFileType.DEBIAN_TARBALL)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0-2.debian.tar.xz'),
             SourcePackageFileType.DEBIAN_TARBALL)
 
         # And even native tarballs!
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.tar.gz'),
             SourcePackageFileType.NATIVE_TARBALL)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.tar.bz2'),
             SourcePackageFileType.NATIVE_TARBALL)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.tar.xz'),
             SourcePackageFileType.NATIVE_TARBALL)
 
         # (Component) original tarball signatures are detected for any
         # supported compression method.
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig.tar.gz.asc'),
             SourcePackageFileType.ORIG_TARBALL_SIGNATURE)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig.tar.bz2.asc'),
             SourcePackageFileType.ORIG_TARBALL_SIGNATURE)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig.tar.xz.asc'),
             SourcePackageFileType.ORIG_TARBALL_SIGNATURE)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig-foo.tar.gz.asc'),
             SourcePackageFileType.COMPONENT_ORIG_TARBALL_SIGNATURE)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig-bar.tar.bz2.asc'),
             SourcePackageFileType.COMPONENT_ORIG_TARBALL_SIGNATURE)
-        self.assertEquals(
+        self.assertEqual(
             determine_source_file_type('foo_1.0.orig-bar.tar.xz.asc'),
             SourcePackageFileType.COMPONENT_ORIG_TARBALL_SIGNATURE)
 
-        self.assertEquals(None, determine_source_file_type('foo_1.0'))
-        self.assertEquals(None, determine_source_file_type('foo_1.0.blah.gz'))
+        self.assertIsNone(determine_source_file_type('foo_1.0'))
+        self.assertIsNone(determine_source_file_type('foo_1.0.blah.gz'))
 
     def test_determine_binary_file_type(self):
         """lp.archiveuploader.utils.determine_binary_file_type should work."""
         # .deb -> DEB
-        self.assertEquals(
+        self.assertEqual(
             determine_binary_file_type('foo_1.0-1_all.deb'),
             BinaryPackageFileType.DEB)
 
         # .ddeb -> DDEB
-        self.assertEquals(
+        self.assertEqual(
             determine_binary_file_type('foo_1.0-1_all.ddeb'),
             BinaryPackageFileType.DDEB)
 
         # .udeb -> UDEB
-        self.assertEquals(
+        self.assertEqual(
             determine_binary_file_type('foo_1.0-1_all.udeb'),
             BinaryPackageFileType.UDEB)
 
-        self.assertEquals(determine_binary_file_type('foo_1.0'), None)
-        self.assertEquals(determine_binary_file_type('foo_1.0.notdeb'), None)
+        self.assertEqual(determine_binary_file_type('foo_1.0'), None)
+        self.assertEqual(determine_binary_file_type('foo_1.0.notdeb'), None)
 
     def testPrefixMultilineString(self):
         """lp.archiveuploader.utils.prefix_multi_line_string should work"""
         from lp.archiveuploader.utils import prefix_multi_line_string
-        self.assertEquals("A:foo\nA:bar",
-                          prefix_multi_line_string("foo\nbar", "A:"))
-        self.assertEquals("A:foo\nA:bar",
-                          prefix_multi_line_string("foo\n\nbar", "A:"))
-        self.assertEquals("A:foo\nA:\nA:bar",
-                          prefix_multi_line_string("foo\n\nbar", "A:", 1))
+        self.assertEqual("A:foo\nA:bar",
+                         prefix_multi_line_string("foo\nbar", "A:"))
+        self.assertEqual("A:foo\nA:bar",
+                         prefix_multi_line_string("foo\n\nbar", "A:"))
+        self.assertEqual("A:foo\nA:\nA:bar",
+                         prefix_multi_line_string("foo\n\nbar", "A:", 1))
 
     def testExtractComponent(self):
         """lp.archiveuploader.utils.extract_component_from_section should work
@@ -147,21 +147,21 @@
         from lp.archiveuploader.utils import extract_component_from_section
 
         (sect, comp) = extract_component_from_section("libs")
-        self.assertEquals(sect, "libs")
-        self.assertEquals(comp, "main")
+        self.assertEqual(sect, "libs")
+        self.assertEqual(comp, "main")
 
         (sect, comp) = extract_component_from_section("restricted/libs")
-        self.assertEquals(sect, "libs")
-        self.assertEquals(comp, "restricted")
+        self.assertEqual(sect, "libs")
+        self.assertEqual(comp, "restricted")
 
         (sect, comp) = extract_component_from_section("libs", "multiverse")
-        self.assertEquals(sect, "libs")
-        self.assertEquals(comp, "multiverse")
+        self.assertEqual(sect, "libs")
+        self.assertEqual(comp, "multiverse")
 
         (sect, comp) = extract_component_from_section("restricted/libs",
                                                       "multiverse")
-        self.assertEquals(sect, "libs")
-        self.assertEquals(comp, "restricted")
+        self.assertEqual(sect, "libs")
+        self.assertEqual(comp, "restricted")
 
     def testParseMaintainerOkay(self):
         """lp.archiveuploader.utils.parse_maintainer should parse correctly
@@ -224,9 +224,9 @@
 
         for case in cases:
             (name, email) = parse_maintainer_bytes(case[0], 'Maintainer')
-            self.assertEquals(case[2], name)
-            self.assertEquals(case[3], email)
-            self.assertEquals(case[1], rfc822_encode_address(name, email))
+            self.assertEqual(case[2], name)
+            self.assertEqual(case[3], email)
+            self.assertEqual(case[1], rfc822_encode_address(name, email))
 
     def testParseMaintainerRaises(self):
         """lp.archiveuploader.utils.parse_maintainer should raise on incorrect
@@ -251,7 +251,7 @@
     def test_re_isadeb(self):
         # Verify that the three binary extensions match the regexp.
         for extension in ('deb', 'ddeb', 'udeb'):
-            self.assertEquals(
+            self.assertEqual(
                 ('foo-bar', '1.0', 'i386', extension),
                 re_isadeb.match('foo-bar_1.0_i386.%s' % extension).groups())
 
@@ -270,13 +270,13 @@
             'orig-foo_bar.tar.gz',
             'debian.tar.gz', 'debian.tar.bz2', 'debian.tar.xz')
         for extension in extensions:
-            self.assertEquals(
+            self.assertEqual(
                 ('foo-bar', '1.0', extension),
                 re_issource.match('foo-bar_1.0.%s' % extension).groups())
 
         # While orig-*.tar.gz is all interpreted as extension, *orig-*.tar.gz
         # is taken to have an extension of just 'tar.gz'.
-        self.assertEquals(
+        self.assertEqual(
             ('foo-bar', '1.0.porig-bar', 'tar.gz'),
             re_issource.match('foo-bar_1.0.porig-bar.tar.gz').groups())
 
@@ -301,7 +301,7 @@
         extract_dpkg_source(
             datadir(os.path.join('suite', 'bar_1.0-1', 'bar_1.0-1.dsc')),
             temp_dir)
-        self.assertEquals(["bar-1.0"], os.listdir(temp_dir))
+        self.assertEqual(["bar-1.0"], os.listdir(temp_dir))
         self.assertContentEqual(
             ["THIS_IS_BAR", "debian"],
             os.listdir(os.path.join(temp_dir, "bar-1.0")))
@@ -311,4 +311,4 @@
         err = self.assertRaises(
             DpkgSourceError, extract_dpkg_source,
             "thispathdoesntexist", temp_dir)
-        self.assertEquals(2, err.result)
+        self.assertEqual(2, err.result)
 
=== modified file 'lib/lp/blueprints/browser/tests/test_breadcrumbs.py'
--- lib/lp/blueprints/browser/tests/test_breadcrumbs.py	2017-10-25 13:10:41 +0000
+++ lib/lp/blueprints/browser/tests/test_breadcrumbs.py	2018-01-02 16:24:23 +0000
@@ -27,15 +27,15 @@
         crumbs = self.getBreadcrumbsForObject(
             self.product, rootsite='blueprints')
         last_crumb = crumbs[-1]
-        self.assertEquals(last_crumb.url, self.product_specs_url)
-        self.assertEquals(last_crumb.text, 'Blueprints')
+        self.assertEqual(last_crumb.url, self.product_specs_url)
+        self.assertEqual(last_crumb.text, 'Blueprints')
 
     def test_person(self):
         crumbs = self.getBreadcrumbsForObject(
             self.person, rootsite='blueprints')
         last_crumb = crumbs[-1]
-        self.assertEquals(last_crumb.url, self.person_specs_url)
-        self.assertEquals(last_crumb.text, 'Blueprints')
+        self.assertEqual(last_crumb.url, self.person_specs_url)
+        self.assertEqual(last_crumb.text, 'Blueprints')
 
 
 class TestSpecificationBreadcrumb(BaseBreadcrumbTestCase):
@@ -53,6 +53,5 @@
     def test_specification(self):
         crumbs = self.getBreadcrumbsForObject(self.specification)
         last_crumb = crumbs[-1]
-        self.assertEquals(last_crumb.url, self.specification_url)
-        self.assertEquals(
-            last_crumb.text, self.specification.title)
+        self.assertEqual(last_crumb.url, self.specification_url)
+        self.assertEqual(last_crumb.text, self.specification.title)
 
=== modified file 'lib/lp/blueprints/model/tests/test_specification.py'
--- lib/lp/blueprints/model/tests/test_specification.py	2017-10-25 13:10:41 +0000
+++ lib/lp/blueprints/model/tests/test_specification.py	2018-01-02 16:24:23 +0000
@@ -495,7 +495,7 @@
             assignee=None, milestone=milestone)
 
         # We start with no work items.
-        self.assertEquals([], list(spec.work_items))
+        self.assertEqual([], list(spec.work_items))
 
         login_person(spec.owner)
         spec.updateWorkItems([work_item1_data, work_item2_data])
 
=== modified file 'lib/lp/bugs/adapters/tests/test_bugchange.py'
--- lib/lp/bugs/adapters/tests/test_bugchange.py	2012-03-13 00:45:33 +0000
+++ lib/lp/bugs/adapters/tests/test_bugchange.py	2018-01-02 16:24:23 +0000
@@ -71,8 +71,7 @@
 
         change = list(get_bug_changes(bug_delta))[0]
         self.assertTrue(isinstance(change, BugDescriptionChange))
-        self.assertEquals(
-            BugNotificationLevel.METADATA, change.change_level)
+        self.assertEqual(BugNotificationLevel.METADATA, change.change_level)
 
     def test_change_level_lifecycle_status_closing(self):
         # Changing a bug task status from NEW to FIXRELEASED makes this
@@ -87,8 +86,7 @@
             bugtask_deltas=bugtask_delta)
 
         change = list(get_bug_changes(bug_delta))[0]
-        self.assertEquals(
-            BugNotificationLevel.LIFECYCLE, change.change_level)
+        self.assertEqual(BugNotificationLevel.LIFECYCLE, change.change_level)
 
     def test_change_level_lifecycle_status_reopening(self):
         # Changing a bug task status from FIXRELEASED to TRIAGED makes this
@@ -103,9 +101,7 @@
             bugtask_deltas=bugtask_delta)
 
         change = list(get_bug_changes(bug_delta))[0]
-        self.assertEquals(
-            BugNotificationLevel.LIFECYCLE,
-            change.change_level)
+        self.assertEqual(BugNotificationLevel.LIFECYCLE, change.change_level)
 
     def test_change_level_metadata_status_worked_on(self):
         # Changing a bug task status from TRIAGED to FIXCOMMITTED makes this
@@ -120,8 +116,7 @@
             bugtask_deltas=bugtask_delta)
 
         change = list(get_bug_changes(bug_delta))[0]
-        self.assertEquals(
-            BugNotificationLevel.METADATA, change.change_level)
+        self.assertEqual(BugNotificationLevel.METADATA, change.change_level)
 
     def test_change_level_metadata_status_stays_closed(self):
         # Changing a bug task status from OPINION to WONTFIX makes this
@@ -136,8 +131,7 @@
             bugtask_deltas=bugtask_delta)
 
         change = list(get_bug_changes(bug_delta))[0]
-        self.assertEquals(
-            BugNotificationLevel.METADATA, change.change_level)
+        self.assertEqual(BugNotificationLevel.METADATA, change.change_level)
 
     def test_change_level_metadata_duplicate_of_unresolved(self):
         # Marking a bug as a duplicate of an unresolved bug is a
@@ -153,8 +147,7 @@
                 })
 
         change = list(get_bug_changes(bug_delta))[0]
-        self.assertEquals(
-            BugNotificationLevel.METADATA, change.change_level)
+        self.assertEqual(BugNotificationLevel.METADATA, change.change_level)
 
     def test_change_level_lifecycle_duplicate_of_resolved(self):
         # Marking a bug as a duplicate of a resolved bug is
@@ -170,8 +163,7 @@
                 })
 
         change = list(get_bug_changes(bug_delta))[0]
-        self.assertEquals(
-            BugNotificationLevel.LIFECYCLE, change.change_level)
+        self.assertEqual(BugNotificationLevel.LIFECYCLE, change.change_level)
 
     def test_change_level_metadata_not_duplicate_of_unresolved(self):
         # Un-marking a bug as a duplicate of an unresolved bug is a
@@ -187,8 +179,7 @@
                 })
 
         change = list(get_bug_changes(bug_delta))[0]
-        self.assertEquals(
-            BugNotificationLevel.METADATA, change.change_level)
+        self.assertEqual(BugNotificationLevel.METADATA, change.change_level)
 
     def test_change_level_lifecycle_not_duplicate_of_resolved(self):
         # Un-marking a bug as a duplicate of a resolved bug is
@@ -203,5 +194,4 @@
                 'old': duplicate_of})
 
         change = list(get_bug_changes(bug_delta))[0]
-        self.assertEquals(
-            BugNotificationLevel.LIFECYCLE, change.change_level)
+        self.assertEqual(BugNotificationLevel.LIFECYCLE, change.change_level)
 
=== modified file 'lib/lp/bugs/browser/tests/test_breadcrumbs.py'
--- lib/lp/bugs/browser/tests/test_breadcrumbs.py	2014-02-19 00:35:25 +0000
+++ lib/lp/bugs/browser/tests/test_breadcrumbs.py	2018-01-02 16:24:23 +0000
@@ -24,17 +24,17 @@
     def test_bugtask(self):
         crumbs = self.getBreadcrumbsForObject(self.bugtask)
         last_crumb = crumbs[-1]
-        self.assertEquals(self.bugtask_url, last_crumb.url)
-        self.assertEquals("Bug #%d" % self.bug.id, last_crumb.text)
-        self.assertEquals(
+        self.assertEqual(self.bugtask_url, last_crumb.url)
+        self.assertEqual("Bug #%d" % self.bug.id, last_crumb.text)
+        self.assertEqual(
             u"Bug #%d \u201cborked\u201d" % self.bug.id, last_crumb.detail)
 
     def test_bugtask_child(self):
         crumbs = self.getBreadcrumbsForObject(
             self.bugtask, view_name='+activity')
-        self.assertEquals(crumbs[-1].url, "%s/+activity" % self.bugtask_url)
-        self.assertEquals(crumbs[-2].url, self.bugtask_url)
-        self.assertEquals(crumbs[-2].text, "Bug #%d" % self.bug.id)
+        self.assertEqual(crumbs[-1].url, "%s/+activity" % self.bugtask_url)
+        self.assertEqual(crumbs[-2].url, self.bugtask_url)
+        self.assertEqual(crumbs[-2].text, "Bug #%d" % self.bug.id)
 
     def test_bugtask_comment(self):
         login_person(self.bug.owner)
@@ -88,13 +88,13 @@
         person_bugs_url = canonical_url(person, rootsite='bugs')
         crumbs = self.getBreadcrumbsForObject(person, rootsite='bugs')
         last_crumb = crumbs[-1]
-        self.assertEquals(person_bugs_url, last_crumb.url)
-        self.assertEquals("Bugs", last_crumb.text)
+        self.assertEqual(person_bugs_url, last_crumb.url)
+        self.assertEqual("Bugs", last_crumb.text)
 
     def test_bugtarget(self):
         project = self.factory.makeProduct(name='fnord')
         project_bugs_url = canonical_url(project, rootsite='bugs')
         crumbs = self.getBreadcrumbsForObject(project, rootsite='bugs')
         last_crumb = crumbs[-1]
-        self.assertEquals(project_bugs_url, last_crumb.url)
-        self.assertEquals("Bugs", last_crumb.text)
+        self.assertEqual(project_bugs_url, last_crumb.url)
+        self.assertEqual("Bugs", last_crumb.text)
 
=== modified file 'lib/lp/bugs/browser/tests/test_bug_views.py'
--- lib/lp/bugs/browser/tests/test_bug_views.py	2017-10-21 18:14:14 +0000
+++ lib/lp/bugs/browser/tests/test_bug_views.py	2018-01-02 16:24:23 +0000
@@ -654,7 +654,7 @@
         view = create_initialized_view(
             bug.default_bugtask, '+addcomment', form=form)
         expected_error = u'Either a comment or attachment must be provided.'
-        self.assertEquals(view.errors[0], expected_error)
+        self.assertEqual(view.errors[0], expected_error)
 
     def test_whitespaces_message_with_attached_file(self):
         # If the message only contains whitespaces but a file
 
=== modified file 'lib/lp/bugs/browser/tests/test_bugnomination.py'
--- lib/lp/bugs/browser/tests/test_bugnomination.py	2016-10-05 08:44:13 +0000
+++ lib/lp/bugs/browser/tests/test_bugnomination.py	2018-01-02 16:24:23 +0000
@@ -243,7 +243,7 @@
         return view
 
     def assertApproves(self, nomination):
-        self.assertEquals(
+        self.assertEqual(
             302,
             self.getNominationEditView(
                 nomination,
 
=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2018-01-02 10:54:31 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2018-01-02 16:24:23 +0000
@@ -1751,7 +1751,7 @@
             self.setAttribute(
                 task, 'assignee',
                 self.factory.makePerson(displayname="Foo &<>", name='foo'))
-        self.assertEquals(
+        self.assertEqual(
             "nobody &#8594; Foo &amp;&lt;&gt; (foo)",
             BugActivityItem(task.bug.activity[-1]).change_details)
 
@@ -1759,7 +1759,7 @@
         with celebrity_logged_in('admin'):
             bug = self.factory.makeBug(title="foo")
             self.setAttribute(bug, 'title', "bar &<>")
-        self.assertEquals(
+        self.assertEqual(
             "- foo<br />+ bar &amp;&lt;&gt;",
             BugActivityItem(bug.activity[-1]).change_details)
 
 
=== modified file 'lib/lp/bugs/browser/tests/test_expose.py'
--- lib/lp/bugs/browser/tests/test_expose.py	2015-09-09 16:47:34 +0000
+++ lib/lp/bugs/browser/tests/test_expose.py	2018-01-02 16:24:23 +0000
@@ -249,7 +249,7 @@
         expose_user_administered_teams_to_js(self.request, self.user, context,
             absoluteURL=fake_absoluteURL)
         team_info = self.request.objects['administratedTeams']
-        self.assertEquals(len(team_info), 0)
+        self.assertEqual(len(team_info), 0)
 
     def test_teams_for_distro_with_bug_super(self):
         self._setup_teams(self.user)
 
=== modified file 'lib/lp/bugs/mail/tests/test_handler.py'
--- lib/lp/bugs/mail/tests/test_handler.py	2016-03-23 17:55:39 +0000
+++ lib/lp/bugs/mail/tests/test_handler.py	2018-01-02 16:24:23 +0000
@@ -98,7 +98,7 @@
         # NB SignedMessage by default isn't actually signed, it just has the
         # capability of knowing about signing.
         message = self.factory.makeSignedMessage(body='  affects malone\nhi!')
-        self.assertEquals(message.signature, None)
+        self.assertEqual(message.signature, None)
 
         # Pretend that the mail auth has given us a logged-in user.
         handler = MaloneHandler()
@@ -106,8 +106,8 @@
             mail_handled, add_comment_to_bug, commands = \
                 handler.extractAndAuthenticateCommands(message,
                     '[e-mail]')
-        self.assertEquals(mail_handled, None)
-        self.assertEquals(map(str, commands), [
+        self.assertEqual(mail_handled, None)
+        self.assertEqual(map(str, commands), [
             'bug new',
             'affects malone',
             ])
 
=== modified file 'lib/lp/bugs/model/tests/test_bugtask.py'
--- lib/lp/bugs/model/tests/test_bugtask.py	2017-05-08 11:38:20 +0000
+++ lib/lp/bugs/model/tests/test_bugtask.py	2018-01-02 16:24:23 +0000
@@ -729,7 +729,7 @@
         names = set(
             name for interface in providedBy(delta) for name in interface)
         for name in names:
-            self.assertEquals(getattr(delta, name), expected_delta.get(name))
+            self.assertEqual(getattr(delta, name), expected_delta.get(name))
 
     def test_get_bugwatch_delta(self):
         # Exercise getDelta() with a change to bugwatch.
@@ -1199,8 +1199,8 @@
 
         # Get a debbugs watch.
         watch_debbugs_327452 = bugwatchset.get(9)
-        self.assertEquals(watch_debbugs_327452.bugtracker.name, "debbugs")
-        self.assertEquals(watch_debbugs_327452.remotebug, "327452")
+        self.assertEqual(watch_debbugs_327452.bugtracker.name, "debbugs")
+        self.assertEqual(watch_debbugs_327452.remotebug, "327452")
 
         # Associate the watch to a Fix Released task.
         debian = getUtility(IDistributionSet).getByName("debian")
@@ -2208,7 +2208,7 @@
     def test_distribution_to_package_works(self):
         distro = self.factory.makeDistribution()
         dsp = self.factory.makeDistributionSourcePackage(distribution=distro)
-        self.assertEquals(dsp.distribution, distro)
+        self.assertEqual(dsp.distribution, distro)
         self.assertTransitionWorks(distro, dsp)
 
     def test_package_to_package_works(self):
 
=== modified file 'lib/lp/bugs/scripts/checkwatches/tests/test_core.py'
--- lib/lp/bugs/scripts/checkwatches/tests/test_core.py	2018-01-02 10:54:31 +0000
+++ lib/lp/bugs/scripts/checkwatches/tests/test_core.py	2018-01-02 16:24:23 +0000
@@ -244,7 +244,7 @@
         transaction.commit()
         master._updateBugTracker(bug_tracker)
         for bug_watch in bug_watches:
-            self.assertEquals(
+            self.assertEqual(
                 BugWatchActivityStatus.CONNECTION_ERROR,
                 bug_watch.last_error_type)
         self.assertEqual(
@@ -264,7 +264,7 @@
         transaction.commit()
         master._updateBugTracker(bug_tracker)
         for bug_watch in bug_watches:
-            self.assertEquals(
+            self.assertEqual(
                 BugWatchActivityStatus.UNKNOWN,
                 bug_watch.last_error_type)
         self.assertEqual(
 
=== modified file 'lib/lp/bugs/scripts/tests/test_bugnotification.py'
--- lib/lp/bugs/scripts/tests/test_bugnotification.py	2015-08-06 12:09:28 +0000
+++ lib/lp/bugs/scripts/tests/test_bugnotification.py	2018-01-02 16:24:23 +0000
@@ -439,20 +439,20 @@
 
     def test_with_nothing(self):
         # Nothing is generated if an empty list is passed in.
-        self.assertEquals([], list(notification_comment_batches([])))
+        self.assertEqual([], list(notification_comment_batches([])))
 
     def test_with_one_non_comment_notification(self):
         # Given a single non-comment notification, a single tuple is
         # generated.
         notification = FakeNotification(False)
-        self.assertEquals(
+        self.assertEqual(
             [(1, notification)],
             list(notification_comment_batches([notification])))
 
     def test_with_one_comment_notification(self):
         # Given a single comment notification, a single tuple is generated.
         notification = FakeNotification(True)
-        self.assertEquals(
+        self.assertEqual(
             [(1, notification)],
             list(notification_comment_batches([notification])))
 
@@ -462,7 +462,7 @@
         notification1 = FakeNotification(True)
         notification2 = FakeNotification(False)
         notifications = [notification1, notification2]
-        self.assertEquals(
+        self.assertEqual(
             [(1, notification1), (1, notification2)],
             list(notification_comment_batches(notifications)))
 
@@ -472,7 +472,7 @@
         notification1 = FakeNotification(False)
         notification2 = FakeNotification(True)
         notifications = [notification1, notification2]
-        self.assertEquals(
+        self.assertEqual(
             [(1, notification1), (1, notification2)],
             list(notification_comment_batches(notifications)))
 
@@ -483,7 +483,7 @@
         notification2 = FakeNotification(True)
         notification3 = FakeNotification(False)
         notifications = [notification1, notification2, notification3]
-        self.assertEquals(
+        self.assertEqual(
             [(1, notification1), (1, notification2), (1, notification3)],
             list(notification_comment_batches(notifications)))
 
@@ -500,7 +500,7 @@
             notification1, notification2,
             notification3, notification4,
             ]
-        self.assertEquals(
+        self.assertEqual(
             [(1, notification1), (1, notification2),
              (1, notification3), (2, notification4)],
             list(notification_comment_batches(notifications)))
@@ -511,20 +511,20 @@
 
     def test_with_nothing(self):
         # Nothing is generated if an empty list is passed in.
-        self.assertEquals([], list(notification_batches([])))
+        self.assertEqual([], list(notification_batches([])))
 
     def test_with_one_non_comment_notification(self):
         # Given a single non-comment notification, a single batch is
         # generated.
         notification = FakeNotification(False)
-        self.assertEquals(
+        self.assertEqual(
             [[notification]],
             list(notification_batches([notification])))
 
     def test_with_one_comment_notification(self):
         # Given a single comment notification, a single batch is generated.
         notification = FakeNotification(True)
-        self.assertEquals(
+        self.assertEqual(
             [[notification]],
             list(notification_batches([notification])))
 
@@ -534,7 +534,7 @@
         notification1 = FakeNotification(True)
         notification2 = FakeNotification(False)
         notifications = [notification1, notification2]
-        self.assertEquals(
+        self.assertEqual(
             [[notification1, notification2]],
             list(notification_batches(notifications)))
 
@@ -544,7 +544,7 @@
         notification1 = FakeNotification(False)
         notification2 = FakeNotification(True)
         notifications = [notification1, notification2]
-        self.assertEquals(
+        self.assertEqual(
             [[notification1, notification2]],
             list(notification_batches(notifications)))
 
@@ -555,7 +555,7 @@
         notification2 = FakeNotification(True)
         notification3 = FakeNotification(False)
         notifications = [notification1, notification2, notification3]
-        self.assertEquals(
+        self.assertEqual(
             [[notification1, notification2, notification3]],
             list(notification_batches(notifications)))
 
@@ -571,7 +571,7 @@
             notification1, notification2,
             notification3, notification4,
             ]
-        self.assertEquals(
+        self.assertEqual(
             [[notification1, notification2, notification3], [notification4]],
             list(notification_batches(notifications)))
 
@@ -579,20 +579,20 @@
         # Batches are grouped by bug.
         notifications = [FakeNotification(bug=1) for number in range(5)]
         observed = list(notification_batches(notifications))
-        self.assertEquals([notifications], observed)
+        self.assertEqual([notifications], observed)
 
     def test_notifications_for_different_bugs(self):
         # Batches are grouped by bug.
         notifications = [FakeNotification(bug=number) for number in range(5)]
         expected = [[notification] for notification in notifications]
         observed = list(notification_batches(notifications))
-        self.assertEquals(expected, observed)
+        self.assertEqual(expected, observed)
 
     def test_notifications_for_same_owner(self):
         # Batches are grouped by owner.
         notifications = [FakeNotification(owner=1) for number in range(5)]
         observed = list(notification_batches(notifications))
-        self.assertEquals([notifications], observed)
+        self.assertEqual([notifications], observed)
 
     def test_notifications_for_different_owners(self):
         # Batches are grouped by owner.
@@ -600,7 +600,7 @@
             FakeNotification(owner=number) for number in range(5)]
         expected = [[notification] for notification in notifications]
         observed = list(notification_batches(notifications))
-        self.assertEquals(expected, observed)
+        self.assertEqual(expected, observed)
 
     def test_notifications_with_mixed_bugs_and_owners(self):
         # Batches are grouped by bug and owner.
@@ -612,7 +612,7 @@
             ]
         expected = [[notification] for notification in notifications]
         observed = list(notification_batches(notifications))
-        self.assertEquals(expected, observed)
+        self.assertEqual(expected, observed)
 
     def test_notifications_with_mixed_bugs_and_owners_2(self):
         # Batches are grouped by bug and owner.
@@ -624,7 +624,7 @@
             ]
         expected = [notifications[0:2], notifications[2:4]]
         observed = list(notification_batches(notifications))
-        self.assertEquals(expected, observed)
+        self.assertEqual(expected, observed)
 
     def test_notifications_with_mixed_bugs_owners_and_comments(self):
         # Batches are grouped by bug, owner and comments.
@@ -636,7 +636,7 @@
             ]
         expected = [notifications[0:3], notifications[3:4]]
         observed = list(notification_batches(notifications))
-        self.assertEquals(expected, observed)
+        self.assertEqual(expected, observed)
 
 
 class EmailNotificationTestBase(TestCaseWithFactory):
@@ -1122,7 +1122,7 @@
         self.addFilter(u"Test filter")
 
         the_subscriber = self.subscription.subscriber
-        self.assertEquals(
+        self.assertEqual(
             {other_person.preferredemail.email: [u"Someone's filter"],
              the_subscriber.preferredemail.email: [u"Test filter"]},
             self.getSubscriptionEmailHeaders(by_person=True))
 
=== modified file 'lib/lp/buildmaster/browser/tests/test_processor.py'
--- lib/lp/buildmaster/browser/tests/test_processor.py	2015-04-20 11:07:41 +0000
+++ lib/lp/buildmaster/browser/tests/test_processor.py	2018-01-02 16:24:23 +0000
@@ -16,7 +16,7 @@
 
     def test_processor_url(self):
         quantum = self.factory.makeProcessor('quantum')
-        self.assertEquals(
+        self.assertEqual(
             '/+processors/quantum',
             canonical_url(quantum, force_local_path=True))
 
@@ -24,4 +24,4 @@
         quantum = self.factory.makeProcessor('quantum')
         obj, view, request = test_traverse(
             'http://api.launchpad.dev/devel/+processors/quantum')
-        self.assertEquals(quantum, obj)
+        self.assertEqual(quantum, obj)
 
=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py'
--- lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py	2016-06-01 15:13:12 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py	2018-01-02 16:24:23 +0000
@@ -269,7 +269,7 @@
             result=True)
 
     def assertResultCount(self, count, result):
-        self.assertEquals(
+        self.assertEqual(
             1, len(os.listdir(os.path.join(self.upload_root, result))))
 
     @defer.inlineCallbacks
 
=== modified file 'lib/lp/buildmaster/tests/test_processor.py'
--- lib/lp/buildmaster/tests/test_processor.py	2015-04-20 11:07:41 +0000
+++ lib/lp/buildmaster/tests/test_processor.py	2018-01-02 16:24:23 +0000
@@ -27,7 +27,7 @@
     def test_getByName(self):
         processor_set = getUtility(IProcessorSet)
         q1 = self.factory.makeProcessor(name='q1')
-        self.assertEquals(q1, processor_set.getByName('q1'))
+        self.assertEqual(q1, processor_set.getByName('q1'))
 
     def test_getByName_not_found(self):
         processor_set = getUtility(IProcessorSet)
@@ -42,7 +42,7 @@
         self.factory.makeProcessor(name='q1')
         self.factory.makeProcessor(name='i686')
         self.factory.makeProcessor(name='g4')
-        self.assertEquals(
+        self.assertEqual(
             ['g4', 'i686', 'q1'],
             sorted(
             processor.name for processor in processor_set.getAll()
@@ -68,7 +68,7 @@
         processor = self.webservice.named_get(
             '/+processors', 'getByName', name='transmeta',
             api_version='devel').jsonBody()
-        self.assertEquals('transmeta', processor['name'])
+        self.assertEqual('transmeta', processor['name'])
 
     def test_default_collection(self):
         # Make it easy to filter out sample data
@@ -82,7 +82,7 @@
 
         collection = self.webservice.get(
             '/+processors?ws.size=10', api_version='devel').jsonBody()
-        self.assertEquals(
+        self.assertEqual(
             ['g4', 'i686', 'q1'],
             sorted(
             processor['name'] for processor in collection['entries']
 
=== modified file 'lib/lp/buildmaster/tests/test_queuedepth.py'
--- lib/lp/buildmaster/tests/test_queuedepth.py	2015-05-14 08:50:41 +0000
+++ lib/lp/buildmaster/tests/test_queuedepth.py	2018-01-02 16:24:23 +0000
@@ -75,7 +75,7 @@
     time_stamp = job.date_started or datetime.now(utc)
     estimate = job.getEstimatedJobStartTime(now=time_stamp)
     if delay_in_seconds is None:
-        test.assertEquals(
+        test.assertEqual(
             delay_in_seconds, estimate,
             "An estimate should not be possible at present but one was "
             "returned (%s) nevertheless." % estimate)
@@ -509,7 +509,7 @@
             builder.builderok = False
 
         # No builders capable of running the job at hand are available now.
-        self.assertEquals(0, builders_for_job(apg_job))
+        self.assertEqual(0, builders_for_job(apg_job))
         # The "minimum time to builder" estimation logic is not aware of this
         # though.
         check_mintime_to_builder(self, apg_job, 0)
@@ -526,7 +526,7 @@
 
         # All native builders are disabled now.  No builders capable of
         # running the job at hand are available.
-        self.assertEquals(0, builders_for_job(job))
+        self.assertEqual(0, builders_for_job(job))
         # The "minimum time to builder" estimation logic is not aware of the
         # fact that no builders capable of running the job are available.
         check_mintime_to_builder(self, job, 0)
@@ -678,7 +678,7 @@
             builder.builderok = False
 
         # No builders capable of running the job at hand are available now.
-        self.assertEquals(0, builders_for_job(apg_job))
+        self.assertEqual(0, builders_for_job(apg_job))
         check_mintime_to_builder(self, apg_job, 0)
 
         # Let's add a processor-independent job to the mix.
@@ -687,7 +687,7 @@
             sourcename='my-recipe-digikam', score=9999)
         # There are still builders available for the processor-independent
         # job.
-        self.assertEquals(6, builders_for_job(job))
+        self.assertEqual(6, builders_for_job(job))
         # Even free ones.
         self.assertTrue(
             bq._getFreeBuildersCount(job.processor, job.virtualized) > 0,
@@ -702,7 +702,7 @@
 
         # There are no builders capable of running even the processor
         # independent jobs now.
-        self.assertEquals(0, builders_for_job(job))
+        self.assertEqual(0, builders_for_job(job))
         check_mintime_to_builder(self, job, 0)
 
         # Re-enable the native hppa builders.
@@ -840,9 +840,9 @@
         check_delay_for_job(self, zsh_job, 0)
 
         # Assign the zsh job to a builder.
-        self.assertEquals((None, False), bash_job._getHeadJobPlatform())
+        self.assertEqual((None, False), bash_job._getHeadJobPlatform())
         assign_to_builder(self, 'xx-recipe-zsh', 1, None)
-        self.assertEquals((1, False), bash_job._getHeadJobPlatform())
+        self.assertEqual((1, False), bash_job._getHeadJobPlatform())
 
         # Now that the highest-scored job is out of the way, the estimation
         # for the 'bash' recipe build is 222 seconds shorter.
@@ -858,7 +858,7 @@
         # Also, the platform of the postgres job is returned since it *is*
         # the head job now.
         pg_platform = (postgres_job.processor.id, postgres_job.virtualized)
-        self.assertEquals(pg_platform, postgres_job._getHeadJobPlatform())
+        self.assertEqual(pg_platform, postgres_job._getHeadJobPlatform())
 
 
 class TestJobDispatchTimeEstimation(MultiArchBuildsBase):
@@ -948,7 +948,7 @@
         #   processor-independent jobs:
         #       (12:56 + 11:05 + 18:30 + 16:38 + 14:47 + 9:14)/6  = 831
         check_estimate(self, gcc_job, 1671)
-        self.assertEquals(5, builders_for_job(gcc_job))
+        self.assertEqual(5, builders_for_job(gcc_job))
 
     def test_proc_indep_virtual_true(self):
         xxr_build, xxr_job = find_job(self, 'xxr-apt-build', None)
@@ -1029,8 +1029,8 @@
         #   processor-independent jobs :
         #       (12:56 + 11:05 + 18:30 + 16:38 + 14:47)/5         =  887
         # waiting time for next builder:                          =  120
-        self.assertEquals(2, builders_for_job(vim_job))
-        self.assertEquals(9, builders_for_job(xxr_job))
+        self.assertEqual(2, builders_for_job(vim_job))
+        self.assertEqual(9, builders_for_job(xxr_job))
         check_estimate(self, vim_job, 2747)
 
     def test_estimation_binary_virtual_headjob(self):
 
=== modified file 'lib/lp/buildmaster/tests/test_webservice.py'
--- lib/lp/buildmaster/tests/test_webservice.py	2015-09-29 01:38:34 +0000
+++ lib/lp/buildmaster/tests/test_webservice.py	2018-01-02 16:24:23 +0000
@@ -79,7 +79,7 @@
         logout()
         results = self.webservice.named_get(
             '/builders', 'getBuildQueueSizes', api_version='devel')
-        self.assertEquals(
+        self.assertEqual(
             ['nonvirt', 'virt'], sorted(results.jsonBody().keys()))
 
     def test_getBuildersForQueue(self):
@@ -99,7 +99,7 @@
             '/builders', 'getBuildersForQueue',
             processor=api_url(quantum), virtualized=True,
             api_version='devel').jsonBody()
-        self.assertEquals(
+        self.assertEqual(
             ['quantum_builder1', 'quantum_builder2'],
             sorted(builder['name'] for builder in results['entries']))
 
 
=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2017-11-10 11:28:43 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2018-01-02 16:24:23 +0000
@@ -1046,7 +1046,7 @@
             browser.contents,
             Contains('Public branches are not allowed for target Commercial.'))
         with person_logged_in(owner):
-            self.assertEquals(initial_target, branch.target.context)
+            self.assertEqual(initial_target, branch.target.context)
 
     def test_information_type_in_ui(self):
         # The information_type of a branch can be changed via the UI by an
 
=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2017-10-21 18:14:14 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2018-01-02 16:24:23 +0000
@@ -443,7 +443,7 @@
             self.makeBranchAndPackage(), '+new-recipe', user=self.chef)
         # The options for the owner include the Good Chefs team.
         options = browser.getControl(name='field.owner.owner').displayOptions
-        self.assertEquals(
+        self.assertEqual(
             ['Good Chefs (good-chefs)', 'Master Chef (chef)'],
             sorted([str(option) for option in options]))
 
 
=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2017-11-06 09:32:45 +0000
+++ lib/lp/code/model/tests/test_branch.py	2018-01-02 16:24:23 +0000
@@ -1240,8 +1240,8 @@
         branch_id = self.branch.id
         branch_set = getUtility(IBranchLookup)
         self.branch.destroySelf()
-        self.assert_(branch_set.get(branch_id) is None,
-                     "The branch has not been deleted.")
+        self.assertIsNone(
+            branch_set.get(branch_id), "The branch has not been deleted.")
 
     def test_stackedBranchDisablesDeletion(self):
         # A branch that is stacked upon cannot be deleted.
 
=== modified file 'lib/lp/code/model/tests/test_branchmergeproposal.py'
--- lib/lp/code/model/tests/test_branchmergeproposal.py	2017-11-24 17:22:34 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposal.py	2018-01-02 16:24:23 +0000
@@ -2354,13 +2354,13 @@
         self.factory.makeRevisionsForBranch(bmp.source_branch, count=5)
         r1 = bmp.source_branch.getBranchRevision(sequence=1)
         initial_revisions = list(bmp.getUnlandedSourceBranchRevisions())
-        self.assertEquals(5, len(initial_revisions))
+        self.assertEqual(5, len(initial_revisions))
         self.assertIn(r1, initial_revisions)
         # If we push one of the revisions into the target, it disappears
         # from the unlanded list.
         bmp.target_branch.createBranchRevision(1, r1.revision)
         partial_revisions = list(bmp.getUnlandedSourceBranchRevisions())
-        self.assertEquals(4, len(partial_revisions))
+        self.assertEqual(4, len(partial_revisions))
         self.assertNotIn(r1, partial_revisions)
 
 
 
=== modified file 'lib/lp/code/model/tests/test_codeimportjob.py'
--- lib/lp/code/model/tests/test_codeimportjob.py	2017-10-04 01:53:48 +0000
+++ lib/lp/code/model/tests/test_codeimportjob.py	2018-01-02 16:24:23 +0000
@@ -137,7 +137,7 @@
         """Assert that the expected job is chosen by getJobForMachine."""
         observed_job = getUtility(ICodeImportJobSet).getJobForMachine(
             self.machine.hostname, worker_limit=10)
-        self.assert_(observed_job is not None, "No job was selected.")
+        self.assertIsNotNone(observed_job, "No job was selected.")
         self.assertEqual(desired_job, observed_job,
                          "Expected job not selected.")
 
@@ -145,7 +145,7 @@
         """Assert that no job is selected."""
         observed_job = getUtility(ICodeImportJobSet).getJobForMachine(
             'machine', worker_limit=10)
-        self.assert_(observed_job is None, "Job unexpectedly selected.")
+        self.assertIsNone(observed_job, "Job unexpectedly selected.")
 
     def test_nothingSelectedIfNothingCreated(self):
         # There are no due jobs pending if we don't create any (this
@@ -775,7 +775,7 @@
         getUtility(ICodeImportJobWorkflow).finishJob(
             running_job, CodeImportResultStatus.SUCCESS, None)
         new_job = code_import.import_job
-        self.assert_(new_job is not None)
+        self.assertIsNotNone(new_job)
         self.assertEqual(new_job.state, CodeImportJobState.PENDING)
         self.assertEqual(new_job.machine, None)
         self.assertEqual(
@@ -791,7 +791,7 @@
         getUtility(ICodeImportJobWorkflow).finishJob(
             running_job, CodeImportResultStatus.SUCCESS_PARTIAL, None)
         new_job = code_import.import_job
-        self.assert_(new_job is not None)
+        self.assertIsNotNone(new_job)
         self.assertEqual(new_job.state, CodeImportJobState.PENDING)
         self.assertEqual(new_job.machine, None)
         self.assertSqlAttributeEqualsDate(new_job, 'date_due', UTC_NOW)
 
=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
--- lib/lp/code/model/tests/test_recipebuilder.py	2017-10-04 01:53:48 +0000
+++ lib/lp/code/model/tests/test_recipebuilder.py	2018-01-02 16:24:23 +0000
@@ -128,7 +128,7 @@
         job.setBuilder(builder, OkSlave())
         logger = BufferLogger()
         job.verifyBuildRequest(logger)
-        self.assertEquals("", logger.getLogBuffer())
+        self.assertEqual("", logger.getLogBuffer())
 
     def test_verifyBuildRequest_non_virtual(self):
         # verifyBuildRequest will raise if a non-virtual builder is proposed.
 
=== modified file 'lib/lp/code/model/tests/test_revision.py'
--- lib/lp/code/model/tests/test_revision.py	2017-10-04 01:49:22 +0000
+++ lib/lp/code/model/tests/test_revision.py	2018-01-02 16:24:23 +0000
@@ -215,7 +215,7 @@
         # IRevisionSet.getByRevisionId returns the revision with that id.
         revision = self.factory.makeRevision()
         found = self.revision_set.getByRevisionId(revision.revision_id)
-        self.assertEquals(revision, found)
+        self.assertEqual(revision, found)
 
     def test_getRevisionById_nonexistent(self):
         # IRevisionSet.getByRevisionId returns None if there is no revision
 
=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2017-10-04 01:53:48 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2018-01-02 16:24:23 +0000
@@ -356,9 +356,9 @@
             date_created=datetime.now(utc) - timedelta(hours=24, seconds=1),
             status=BuildStatus.FULLYBUILT)
         daily_builds = SourcePackageRecipeBuild.makeDailyBuilds()
-        self.assertEquals(1, len(daily_builds))
+        self.assertEqual(1, len(daily_builds))
         actual_title = [b.title for b in daily_builds]
-        self.assertEquals([build.title], actual_title)
+        self.assertEqual([build.title], actual_title)
 
     def test_makeDailyBuilds_with_an_older_and_newer_build(self):
         # If a recipe has been built twice, and the most recent build is
@@ -374,7 +374,7 @@
                 date_created=datetime.now(utc) - timediff,
                 status=BuildStatus.FULLYBUILT)
         daily_builds = SourcePackageRecipeBuild.makeDailyBuilds()
-        self.assertEquals([], list(daily_builds))
+        self.assertEqual([], list(daily_builds))
 
     def test_makeDailyBuilds_with_new_build_different_archive(self):
         # If a recipe has been built into an archive that isn't the
@@ -390,7 +390,7 @@
             status=BuildStatus.FULLYBUILT)
         daily_builds = SourcePackageRecipeBuild.makeDailyBuilds()
         actual_title = [b.title for b in daily_builds]
-        self.assertEquals([build.title], actual_title)
+        self.assertEqual([build.title], actual_title)
 
     def test_makeDailyBuilds_with_disallowed_series(self):
         # If a recipe is set to build into a disallowed series,
@@ -402,7 +402,7 @@
         distroseries = list(recipe.distroseries)[0]
         removeSecurityProxy(distroseries).status = SeriesStatus.OBSOLETE
         SourcePackageRecipeBuild.makeDailyBuilds(logger)
-        self.assertEquals([], self.oopses)
+        self.assertEqual([], self.oopses)
         self.assertIn(
             "DEBUG  - cannot build against Warty (4.10).",
             logger.getLogBuffer())
@@ -452,7 +452,7 @@
     def test_getUploader(self):
         # For ACL purposes the uploader is the build requester.
         build = self.makeSourcePackageRecipeBuild()
-        self.assertEquals(build.requester,
+        self.assertEqual(build.requester,
             build.getUploader(None))
 
     def test_getByBuildFarmJob(self):
@@ -497,7 +497,7 @@
         build.updateStatus(BuildStatus.FULLYBUILT)
         IStore(build).flush()
         build.notify()
-        self.assertEquals(0, len(pop_notifications()))
+        self.assertEqual(0, len(pop_notifications()))
 
     def test_notify_when_recipe_deleted(self):
         """Notify does nothing if recipe has been deleted."""
@@ -516,4 +516,4 @@
         IStore(build).flush()
         build.notify()
         notifications = pop_notifications()
-        self.assertEquals(0, len(notifications))
+        self.assertEqual(0, len(notifications))
 
=== modified file 'lib/lp/code/tests/test_branch_webservice.py'
--- lib/lp/code/tests/test_branch_webservice.py	2017-10-04 01:53:48 +0000
+++ lib/lp/code/tests/test_branch_webservice.py	2018-01-02 16:24:23 +0000
@@ -114,7 +114,7 @@
             target_branch=target, initial_comment='Merge\nit!',
             needs_review=True, commit_message='It was merged!\n',
             reviewers=[source.owner.self_link], review_types=[])
-        self.assertEquals(
+        self.assertEqual(
             exception.content,
             'reviewers and review_types must be equal length.')
 
@@ -148,7 +148,7 @@
             BadRequest, source.createMergeProposal,
             target_branch=source, initial_comment='Merge\nit!',
             needs_review=True, commit_message='It was merged!\n')
-        self.assertEquals(
+        self.assertEqual(
             exception.content,
             'Source and target branches must be different.')
 
 
=== modified file 'lib/lp/code/tests/test_bzr.py'
--- lib/lp/code/tests/test_bzr.py	2017-10-04 01:49:22 +0000
+++ lib/lp/code/tests/test_bzr.py	2018-01-02 16:24:23 +0000
@@ -85,7 +85,7 @@
 
     def test_empty(self):
         branch = self.make_branch('test')
-        self.assertEquals([], branch_revision_history(branch))
+        self.assertEqual([], branch_revision_history(branch))
 
     def test_some_commits(self):
         branch = self.make_branch('test')
@@ -93,7 +93,7 @@
         tree.commit('acommit', rev_id=b'A')
         tree.commit('bcommit', rev_id=b'B')
         tree.commit('ccommit', rev_id=b'C')
-        self.assertEquals(
+        self.assertEqual(
             [b'A', b'B', b'C'], branch_revision_history(tree.branch))
 
 
 
=== modified file 'lib/lp/code/xmlrpc/tests/test_codehosting.py'
--- lib/lp/code/xmlrpc/tests/test_codehosting.py	2016-12-31 05:01:10 +0000
+++ lib/lp/code/xmlrpc/tests/test_codehosting.py	2018-01-02 16:24:23 +0000
@@ -258,7 +258,7 @@
         self.assertUnmirrored(branch)
 
         branch.requestMirror()
-        self.assertEquals(
+        self.assertEqual(
             branch.id, self.codehosting_api.acquireBranchToPull([])[0])
 
         failure_message = self.factory.getUniqueString()
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2017-01-12 18:01:56 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2018-01-02 16:24:23 +0000
@@ -253,7 +253,7 @@
         target_url = store._getMirrorURL(self.arbitrary_branch_id)
         knit_format = format_registry.get('knit')()
         tree = create_branch_with_one_revision(target_url, format=knit_format)
-        self.assertNotEquals(
+        self.assertNotEqual(
             tree.bzrdir._format.repository_format.network_name(),
             default_format.repository_format.network_name())
 
@@ -261,8 +261,8 @@
         new_branch = store.pull(
             self.arbitrary_branch_id, self.temp_dir, default_format)
         # Make sure backup.bzr is removed, as it interferes with CSCVS.
-        self.assertEquals(os.listdir(self.temp_dir), [".bzr"])
-        self.assertEquals(new_branch.repository._format.network_name(),
+        self.assertEqual(os.listdir(self.temp_dir), [".bzr"])
+        self.assertEqual(new_branch.repository._format.network_name(),
             default_format.repository_format.network_name())
 
     def test_pushUpgradesFormat(self):
@@ -292,13 +292,13 @@
         # Only .bzr is left behind. The scanner removes branches
         # in which invalid directories (such as .bzr.retire.
         # exist). (bug #798560)
-        self.assertEquals(
+        self.assertEqual(
             target_branch.user_transport.list_dir("."),
             [".bzr"])
         self.assertEqual(
             default_format.get_branch_format(),
             target_branch._format)
-        self.assertEquals(
+        self.assertEqual(
             target_branch.last_revision_info(),
             new_branch.last_revision_info())
 
@@ -461,7 +461,7 @@
         store = ImportDataStore(transport, source_details)
         local_name = '%s.tar.gz' % (self.factory.getUniqueString('tarball'),)
         store.fetch(local_name)
-        self.assertEquals(content, open(local_name).read())
+        self.assertEqual(content, open(local_name).read())
 
     def test_fetch_with_dest_transport(self):
         # The second, optional, argument to fetch is the transport in which to
@@ -478,7 +478,7 @@
         self.get_transport(local_prefix).ensure_base()
         local_name = '%s.tar.gz' % (self.factory.getUniqueString(),)
         store.fetch(local_name, self.get_transport(local_prefix))
-        self.assertEquals(
+        self.assertEqual(
             content, open(os.path.join(local_prefix, local_name)).read())
 
     def test_put_copiesFileToTransport(self):
@@ -494,7 +494,7 @@
         # That the remote name is like this is part of the interface of
         # ImportDataStore.
         remote_name = '%08x.tar.gz' % (source_details.target_id,)
-        self.assertEquals(content, transport.get_bytes(remote_name))
+        self.assertEqual(content, transport.get_bytes(remote_name))
 
     def test_put_ensures_base(self):
         # Put ensures that the directory pointed to by the transport exists.
@@ -522,7 +522,7 @@
         # That the remote name is like this is part of the interface of
         # ImportDataStore.
         remote_name = '%08x.tar.gz' % (source_details.target_id,)
-        self.assertEquals(content, transport.get_bytes(remote_name))
+        self.assertEqual(content, transport.get_bytes(remote_name))
 
 
 class MockForeignWorkingTree:
@@ -1110,7 +1110,7 @@
         # There should only be one revision there, the other
         # one is in the stacked-on repository.
         self.addCleanup(stacked_on.lock_read().unlock)
-        self.assertEquals(
+        self.assertEqual(
             base_rev_count,
             len(stacked_on.repository.revisions.keys()))
         worker = self.makeImportWorker(
@@ -1120,15 +1120,15 @@
         self.assertEqual(
             CodeImportWorkerExitCode.SUCCESS, worker.run())
         branch = self.getStoredBazaarBranch(worker)
-        self.assertEquals(
+        self.assertEqual(
             base_rev_count,
             len(stacked_on.repository.revisions.keys()))
         # There should only be one revision there, the other
         # one is in the stacked-on repository.
         self.addCleanup(branch.lock_read().unlock)
-        self.assertEquals(1,
+        self.assertEqual(1,
              len(branch.repository.revisions.without_fallbacks().keys()))
-        self.assertEquals(stacked_on.base, branch.get_stacked_on_url())
+        self.assertEqual(stacked_on.base, branch.get_stacked_on_url())
 
 
 class TestGitImport(WorkerTest, TestActualImportMixin,
@@ -1197,7 +1197,7 @@
         source_details.url = urlutils.join_segment_parameters(
                 source_details.url, {"branch": "other"})
         source_transport = get_transport_from_url(source_details.url)
-        self.assertEquals(
+        self.assertEqual(
             {"branch": "other"},
             source_transport.get_segment_parameters())
         worker = self.makeImportWorker(source_details,
@@ -1207,7 +1207,7 @@
             CodeImportWorkerExitCode.SUCCESS, worker.run())
         branch = worker.getBazaarBranch()
         lastrev = branch.repository.get_revision(branch.last_revision())
-        self.assertEquals(lastrev.message, "Message for other")
+        self.assertEqual(lastrev.message, "Message for other")
 
 
 class TestBzrSvnImport(WorkerTest, SubversionImportHelpers,
@@ -1311,7 +1311,7 @@
         self.policy = CodeImportBranchOpenPolicy("bzr", "bzr")
 
     def test_follows_references(self):
-        self.assertEquals(True, self.policy.shouldFollowReferences())
+        self.assertEqual(True, self.policy.shouldFollowReferences())
 
     def assertBadUrl(self, url):
         self.assertRaises(BadUrl, self.policy.checkOneURL, url)
@@ -1378,7 +1378,7 @@
         branch_url = self.bazaar_store._getMirrorURL(
             worker.source_details.target_id)
         branch = Branch.open(branch_url)
-        self.assertEquals(self.revid, branch.last_revision())
+        self.assertEqual(self.revid, branch.last_revision())
 
     def test_redirect_to_forbidden_url(self):
         class NewUrlBlacklistPolicy(BranchOpenPolicy):
 
=== modified file 'lib/lp/codehosting/scanner/tests/test_buglinks.py'
--- lib/lp/codehosting/scanner/tests/test_buglinks.py	2016-02-04 05:43:46 +0000
+++ lib/lp/codehosting/scanner/tests/test_buglinks.py	2018-01-02 16:24:23 +0000
@@ -61,7 +61,7 @@
         # Parsing a single line should give a dict with a single entry,
         # mapping the bug_id to the status.
         bugs = self.extractBugInfo("https://launchpad.net/bugs/9999 fixed")
-        self.assertEquals(bugs, {9999: 'fixed'})
+        self.assertEqual(bugs, {9999: 'fixed'})
 
     def test_multiple(self):
         # Information about more than one bug can be specified. Make sure that
@@ -69,39 +69,39 @@
         bugs = self.extractBugInfo(
             "https://launchpad.net/bugs/9999 fixed\n"
             "https://launchpad.net/bugs/8888 fixed")
-        self.assertEquals(bugs, {9999: 'fixed',
-                                 8888: 'fixed'})
+        self.assertEqual(bugs, {9999: 'fixed',
+                                8888: 'fixed'})
 
     def test_empty(self):
         # If the property is empty, then return an empty dict.
         bugs = self.extractBugInfo('')
-        self.assertEquals(bugs, {})
+        self.assertEqual(bugs, {})
 
     def test_bad_bug(self):
         # If the given bug is not a valid integer, then skip it, generate an
         # OOPS and continue processing.
         bugs = self.extractBugInfo('https://launchpad.net/~jml fixed')
-        self.assertEquals(bugs, {})
+        self.assertEqual(bugs, {})
 
     def test_non_launchpad_bug(self):
         # References to bugs on sites other than launchpad are ignored.
         bugs = self.extractBugInfo('http://bugs.debian.org/1234 fixed')
-        self.assertEquals(bugs, {})
+        self.assertEqual(bugs, {})
 
     def test_duplicated_line(self):
         # If a particular line is duplicated, silently ignore the duplicates.
         bugs = self.extractBugInfo(
             'https://launchpad.net/bugs/9999 fixed\n'
             'https://launchpad.net/bugs/9999 fixed')
-        self.assertEquals(bugs, {9999: 'fixed'})
+        self.assertEqual(bugs, {9999: 'fixed'})
 
     def test_strict_url_checking(self):
         # Ignore URLs that look like a Launchpad bug URL but aren't.
         bugs = self.extractBugInfo('https://launchpad.net/people/1234 fixed')
-        self.assertEquals(bugs, {})
+        self.assertEqual(bugs, {})
         bugs = self.extractBugInfo(
             'https://launchpad.net/bugs/foo/1234 fixed')
-        self.assertEquals(bugs, {})
+        self.assertEqual(bugs, {})
 
 
 class TestBugLinking(BzrSyncTestCase):
 
=== modified file 'lib/lp/codehosting/scanner/tests/test_bzrsync.py'
--- lib/lp/codehosting/scanner/tests/test_bzrsync.py	2018-01-02 10:54:31 +0000
+++ lib/lp/codehosting/scanner/tests/test_bzrsync.py	2018-01-02 16:24:23 +0000
@@ -359,7 +359,7 @@
         self.commitRevision(committer=author)
         self.syncAndCount(new_revisions=1, new_numbers=1, new_authors=1)
         db_author = RevisionAuthor.selectOneBy(name=author)
-        self.assertEquals(db_author.name, author)
+        self.assertEqual(db_author.name, author)
 
     def test_new_parent(self):
         # Importing two revisions should import a new parent.
@@ -371,13 +371,13 @@
     def test_sync_updates_branch(self):
         # test that the last scanned revision ID is recorded
         self.syncAndCount()
-        self.assertEquals(NULL_REVISION, self.db_branch.last_scanned_id)
+        self.assertEqual(NULL_REVISION, self.db_branch.last_scanned_id)
         last_modified = self.db_branch.date_last_modified
         last_scanned = self.db_branch.last_scanned
         self.commitRevision()
         self.syncAndCount(new_revisions=1, new_numbers=1, new_authors=1)
-        self.assertEquals(self.bzr_branch.last_revision(),
-                          self.db_branch.last_scanned_id)
+        self.assertEqual(self.bzr_branch.last_revision(),
+                         self.db_branch.last_scanned_id)
         self.assertTrue(self.db_branch.last_scanned > last_scanned,
                         "last_scanned was not updated")
         self.assertTrue(self.db_branch.date_last_modified > last_modified,
@@ -814,7 +814,7 @@
         self.makeBzrSync(self.db_branch).syncBranchAndClose()
         # Check that properties were saved to the revision.
         bzr_revision = self.bzr_branch.repository.get_revision('rev1')
-        self.assertEquals(properties, bzr_revision.properties)
+        self.assertEqual(properties, bzr_revision.properties)
         # Check that properties are stored in the database.
         db_revision = getUtility(IRevisionSet).getByRevisionId('rev1')
-        self.assertEquals(properties, db_revision.getProperties())
+        self.assertEqual(properties, db_revision.getProperties())
 
=== modified file 'lib/lp/codehosting/sshserver/tests/test_session.py'
--- lib/lp/codehosting/sshserver/tests/test_session.py	2018-01-02 10:54:31 +0000
+++ lib/lp/codehosting/sshserver/tests/test_session.py	2018-01-02 16:24:23 +0000
@@ -435,7 +435,7 @@
         self.assertRaises(ForbiddenCommand, lookup_command_template, 'foo')
 
     def test_bzr(self):
-        self.assertEquals(
+        self.assertEqual(
             config.root + '/bin/py ' + get_bzr_path() +
             ' lp-serve --inet %(user_id)s',
             lookup_command_template(
 
=== modified file 'lib/lp/codehosting/tests/test_safe_open.py'
--- lib/lp/codehosting/tests/test_safe_open.py	2012-09-06 00:01:38 +0000
+++ lib/lp/codehosting/tests/test_safe_open.py	2018-01-02 16:24:23 +0000
@@ -79,9 +79,8 @@
         # When branch references are forbidden, checkAndFollowBranchReference
         # does not raise on non-references.
         opener = self.makeBranchOpener(False, ['a', None])
-        self.assertEquals(
-            'a', opener.checkAndFollowBranchReference('a'))
-        self.assertEquals(['a'], opener.follow_reference_calls)
+        self.assertEqual('a', opener.checkAndFollowBranchReference('a'))
+        self.assertEqual(['a'], opener.follow_reference_calls)
 
     def testBranchReferenceForbidden(self):
         # checkAndFollowBranchReference raises BranchReferenceForbidden if
@@ -91,16 +90,15 @@
         self.assertRaises(
             BranchReferenceForbidden,
             opener.checkAndFollowBranchReference, 'a')
-        self.assertEquals(['a'], opener.follow_reference_calls)
+        self.assertEqual(['a'], opener.follow_reference_calls)
 
     def testAllowedReference(self):
         # checkAndFollowBranchReference does not raise if following references
         # is allowed and the source URL points to a branch reference to a
         # permitted location.
         opener = self.makeBranchOpener(True, ['a', 'b', None])
-        self.assertEquals(
-            'b', opener.checkAndFollowBranchReference('a'))
-        self.assertEquals(['a', 'b'], opener.follow_reference_calls)
+        self.assertEqual('b', opener.checkAndFollowBranchReference('a'))
+        self.assertEqual(['a', 'b'], opener.follow_reference_calls)
 
     def testCheckReferencedURLs(self):
         # checkAndFollowBranchReference checks if the URL a reference points
@@ -109,7 +107,7 @@
             True, ['a', 'b', None], unsafe_urls=set('b'))
         self.assertRaises(
             BadUrl, opener.checkAndFollowBranchReference, 'a')
-        self.assertEquals(['a'], opener.follow_reference_calls)
+        self.assertEqual(['a'], opener.follow_reference_calls)
 
     def testSelfReferencingBranch(self):
         # checkAndFollowBranchReference raises BranchReferenceLoopError if
@@ -118,7 +116,7 @@
         opener = self.makeBranchOpener(True, ['a', 'a'])
         self.assertRaises(
             BranchLoopError, opener.checkAndFollowBranchReference, 'a')
-        self.assertEquals(['a'], opener.follow_reference_calls)
+        self.assertEqual(['a'], opener.follow_reference_calls)
 
     def testBranchReferenceLoop(self):
         # checkAndFollowBranchReference raises BranchReferenceLoopError if
@@ -128,7 +126,7 @@
         opener = self.makeBranchOpener(True, references)
         self.assertRaises(
             BranchLoopError, opener.checkAndFollowBranchReference, 'a')
-        self.assertEquals(['a', 'b'], opener.follow_reference_calls)
+        self.assertEqual(['a', 'b'], opener.follow_reference_calls)
 
 
 class TrackingProber(BzrProber):
@@ -166,7 +164,7 @@
         opener = self.makeBranchOpener([b.base], probers=[])
         self.assertRaises(NotBranchError, opener.open, b.base)
         opener = self.makeBranchOpener([b.base], probers=[BzrProber])
-        self.assertEquals(b.base, opener.open(b.base).base)
+        self.assertEqual(b.base, opener.open(b.base).base)
 
     def testDefaultProbers(self):
         # If no probers are specified to the constructor
@@ -180,18 +178,18 @@
         TrackingProber.seen_urls = []
         opener = self.makeBranchOpener(["."], probers=[TrackingProber])
         self.assertRaises(NotBranchError, opener.open, ".")
-        self.assertEquals(1, len(TrackingProber.seen_urls))
+        self.assertEqual(1, len(TrackingProber.seen_urls))
         TrackingProber.seen_urls = []
         # And make sure it's registered in such a way that BzrDir.open would
         # use it.
         self.assertRaises(NotBranchError, BzrDir.open, ".")
-        self.assertEquals(1, len(TrackingProber.seen_urls))
+        self.assertEqual(1, len(TrackingProber.seen_urls))
         TrackingProber.seen_urls = []
         # Make sure that SafeBranchOpener doesn't use it if no
         # probers were specified
         opener = self.makeBranchOpener(["."])
         self.assertRaises(NotBranchError, opener.open, ".")
-        self.assertEquals(0, len(TrackingProber.seen_urls))
+        self.assertEqual(0, len(TrackingProber.seen_urls))
 
     def testAllowedURL(self):
         # checkSource does not raise an exception for branches stacked on
@@ -289,8 +287,7 @@
         opener = self.makeBranchOpener(
             [a.base, b.base], probers=[TrackingProber])
         opener.open(b.base)
-        self.assertEquals(
-            set(TrackingProber.seen_urls), set([b.base, a.base]))
+        self.assertEqual(set(TrackingProber.seen_urls), set([b.base, a.base]))
 
     def testCustomOpenerWithBranchReference(self):
         # A custom function for opening a control dir can be specified.
@@ -301,8 +298,7 @@
         opener = self.makeBranchOpener(
             [a.base, b.base], probers=[TrackingProber])
         opener.open(b.base)
-        self.assertEquals(
-            set(TrackingProber.seen_urls), set([b.base, a.base]))
+        self.assertEqual(set(TrackingProber.seen_urls), set([b.base, a.base]))
 
     def test_ignore_fallbacks(self):
         """"Cross-format stacking doesn't error with ignore_fallbacks."""
 
=== modified file 'lib/lp/registry/browser/tests/test_distroseries.py'
--- lib/lp/registry/browser/tests/test_distroseries.py	2017-10-21 18:14:14 +0000
+++ lib/lp/registry/browser/tests/test_distroseries.py	2018-01-02 16:24:23 +0000
@@ -592,7 +592,7 @@
         [launchpad]
         default_batch_size: 2
         """)
-        self.assert_(
+        self.assertTrue(
             isinstance(view.milestone_batch_navigator, BatchNavigator),
             'milestone_batch_navigator is not a BatchNavigator object: %r'
             % view.milestone_batch_navigator)
@@ -693,7 +693,7 @@
         distroseries = self.factory.makeDistroSeries()
         formatted_dict = seriesToVocab(distroseries)
 
-        self.assertEquals(
+        self.assertEqual(
             ['api_uri', 'title', 'value'],
             sorted(formatted_dict.keys()))
 
@@ -1477,9 +1477,9 @@
         job_source = getUtility(IPlainPackageCopyJobSource)
         jobs = list(
             job_source.getActiveJobs(series.distribution.main_archive))
-        self.assertEquals(1, len(jobs))
+        self.assertEqual(1, len(jobs))
         job = jobs[0]
-        self.assertEquals(series, job.target_distroseries)
+        self.assertEqual(series, job.target_distroseries)
         self.assertEqual(dsd.source_package_name.name, job.package_name)
         self.assertEqual(dsd.parent_source_version, job.package_version)
         self.assertEqual(PackagePublishingPocket.RELEASE, job.target_pocket)
@@ -2161,7 +2161,7 @@
                 derived_series, '+localpackagediffs', method='GET',
                 query_string='start=1&batch=1')
 
-        self.assertEquals(
+        self.assertEqual(
             'http://127.0.0.1?start=1&batch=1',
             view.action_url)
 
 
=== modified file 'lib/lp/registry/browser/tests/test_person.py'
--- lib/lp/registry/browser/tests/test_person.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/browser/tests/test_person.py	2018-01-02 16:24:23 +0000
@@ -189,7 +189,7 @@
 
     def test_should_be_profile_page_when_delegating(self):
         """The profile page is the OpenID identifier in normal situation."""
-        self.assertEquals(
+        self.assertEqual(
             'http://launchpad.dev/~eris', self.view.openid_identity_url)
 
     def test_should_be_production_profile_page_when_not_delegating(self):
@@ -202,7 +202,7 @@
             [launchpad]
             non_restricted_hostname: prod.launchpad.dev
             '''))
-        self.assertEquals(
+        self.assertEqual(
             'http://prod.launchpad.dev/~eris', self.view.openid_identity_url)
 
 
 
=== modified file 'lib/lp/registry/browser/tests/test_person_webservice.py'
--- lib/lp/registry/browser/tests/test_person_webservice.py	2017-06-01 12:58:53 +0000
+++ lib/lp/registry/browser/tests/test_person_webservice.py	2018-01-02 16:24:23 +0000
@@ -151,7 +151,7 @@
         self.assertEqual(response.status, 200)
 
         rendered_comment = response.body
-        self.assertEquals(
+        self.assertEqual(
             rendered_comment,
             '<a href="/~test-person" class="sprite person">Test Person</a>')
 
 
=== modified file 'lib/lp/registry/tests/test_distribution.py'
--- lib/lp/registry/tests/test_distribution.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_distribution.py	2018-01-02 16:24:23 +0000
@@ -151,7 +151,7 @@
         distroseries = self.factory.makeDistroSeries()
         spph = self.factory.makeSourcePackagePublishingHistory(
             distroseries=distroseries, sourcepackagename='my-package')
-        self.assertEquals(
+        self.assertEqual(
             spph.sourcepackagerelease.sourcepackagename,
             distroseries.distribution.guessPublishedSourcePackageName(
                 'my-package'))
@@ -164,7 +164,7 @@
             archive=distroseries.main_archive,
             binarypackagename='binary-package',
             source_package_release=spph.sourcepackagerelease)
-        self.assertEquals(
+        self.assertEqual(
             spph.sourcepackagerelease.sourcepackagename,
             distroseries.distribution.guessPublishedSourcePackageName(
                 'binary-package'))
@@ -188,7 +188,7 @@
         distroseries2 = self.factory.makeDistroSeries()
         spph = self.factory.makeSourcePackagePublishingHistory(
             distroseries=distroseries1, sourcepackagename='my-package')
-        self.assertEquals(
+        self.assertEqual(
             spph.sourcepackagerelease.sourcepackagename,
             distroseries1.distribution.guessPublishedSourcePackageName(
                 'my-package'))
@@ -206,7 +206,7 @@
         self.factory.makeBinaryPackagePublishingHistory(
             archive=distroseries.main_archive,
             binarypackagename='my-package', sourcepackagename='other-package')
-        self.assertEquals(
+        self.assertEqual(
             my_spph.sourcepackagerelease.sourcepackagename,
             distroseries.distribution.guessPublishedSourcePackageName(
                 'my-package'))
@@ -223,7 +223,7 @@
             archive=distroseries.main_archive,
             sourcepackagename='new-source-name',
             binarypackagename='my-package')
-        self.assertEquals(
+        self.assertEqual(
             'new-source-name',
             distroseries.distribution.guessPublishedSourcePackageName(
                 'my-package').name)
@@ -235,7 +235,7 @@
             sourcepackagename='my-package')
         self.factory.makeRelatedBranchesForSourcePackage(
             sourcepackage=sourcepackage)
-        self.assertEquals(
+        self.assertEqual(
             'my-package',
             sourcepackage.distribution.guessPublishedSourcePackageName(
                 'my-package').name)
@@ -371,14 +371,14 @@
 
     def test_get_none(self):
         distro = self.factory.makeDistribution()
-        self.assertEquals([],
+        self.assertEqual([],
             list(distro.getSeriesByStatus(SeriesStatus.FROZEN)))
 
     def test_get_current(self):
         distro = self.factory.makeDistribution()
         series = self.factory.makeDistroSeries(distribution=distro,
             status=SeriesStatus.CURRENT)
-        self.assertEquals([series],
+        self.assertEqual([series],
             list(distro.getSeriesByStatus(SeriesStatus.CURRENT)))
 
 
@@ -396,13 +396,13 @@
         distro = self.factory.makeDistribution()
         series = self.factory.makeDistroSeries(distribution=distro,
             name="dappere")
-        self.assertEquals(series, distro.getSeries("dappere"))
+        self.assertEqual(series, distro.getSeries("dappere"))
 
     def test_get_by_version(self):
         distro = self.factory.makeDistribution()
         series = self.factory.makeDistroSeries(distribution=distro,
             name="dappere", version="42.6")
-        self.assertEquals(series, distro.getSeries("42.6"))
+        self.assertEqual(series, distro.getSeries("42.6"))
 
     def test_development_series_alias(self):
         distro = self.factory.makeDistribution()
 
=== modified file 'lib/lp/registry/tests/test_distributionmirror_prober.py'
--- lib/lp/registry/tests/test_distributionmirror_prober.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_distributionmirror_prober.py	2018-01-02 16:24:23 +0000
@@ -261,7 +261,7 @@
 
         protocol.factory = FakeFactory('http://foo.bar/')
         protocol.makeConnection(FakeTransport())
-        self.assertEquals(
+        self.assertEqual(
             'Launchpad Mirror Prober ( https://launchpad.net/ )',
             headers['User-Agent'])
 
@@ -475,10 +475,10 @@
         there's no task currently running.
         """
         self.multi_lock.run(self.callback)
-        self.assertEquals(self.count, 1, "self.callback should have run.")
+        self.assertEqual(self.count, 1, "self.callback should have run.")
 
         self.multi_lock.run(self.callback)
-        self.assertEquals(
+        self.assertEqual(
             self.count, 2, "self.callback should have run twice.")
 
     def test_run_waits_for_first_lock(self):
@@ -489,7 +489,7 @@
 
         # Run self.callback when self.multi_lock is acquired.
         self.multi_lock.run(self.callback)
-        self.assertEquals(
+        self.assertEqual(
             self.count, 0, "self.callback should not have run yet.")
 
         # Release lock_one.
@@ -497,7 +497,7 @@
 
         # multi_lock will now have been able to acquire both semaphores, and
         # so it will have run its task.
-        self.assertEquals(self.count, 1, "self.callback should have run.")
+        self.assertEqual(self.count, 1, "self.callback should have run.")
 
     def test_run_waits_for_second_lock(self):
         """MultiLock.run acquires the second lock before running functions."""
@@ -507,7 +507,7 @@
 
         # Run self.callback when self.multi_lock is acquired.
         self.multi_lock.run(self.callback)
-        self.assertEquals(
+        self.assertEqual(
             self.count, 0, "self.callback should not have run yet.")
 
         # Release lock_two.
@@ -515,7 +515,7 @@
 
         # multi_lock will now have been able to acquire both semaphores, and
         # so it will have run its task.
-        self.assertEquals(self.count, 1, "self.callback should have run.")
+        self.assertEqual(self.count, 1, "self.callback should have run.")
 
     def test_run_waits_for_current_task(self):
         """MultiLock.run waits the end of the current task before running the
@@ -527,7 +527,7 @@
 
         # Run self.callback when self.multi_lock is acquired.
         self.multi_lock.run(self.callback)
-        self.assertEquals(
+        self.assertEqual(
             self.count, 0, "self.callback should not have run yet.")
 
         # Release lock_one.
@@ -535,7 +535,7 @@
 
         # multi_lock will now have been able to acquire both semaphores, and
         # so it will have run its task.
-        self.assertEquals(self.count, 1, "self.callback should have run.")
+        self.assertEqual(self.count, 1, "self.callback should have run.")
 
 
 class TestRedirectAwareProberFactoryAndProtocol(TestCase):
@@ -879,28 +879,28 @@
         # Since we have a single mirror to probe we need to have a single
         # DeferredSemaphore with a limit of PER_HOST_REQUESTS, to ensure we
         # don't issue too many simultaneous connections on that host.
-        self.assertEquals(len(request_manager.host_locks), 1)
+        self.assertEqual(len(request_manager.host_locks), 1)
         multi_lock = request_manager.host_locks[mirror1_host]
-        self.assertEquals(multi_lock.host_lock.limit, PER_HOST_REQUESTS)
+        self.assertEqual(multi_lock.host_lock.limit, PER_HOST_REQUESTS)
         # Note that our multi_lock contains another semaphore to control the
         # overall number of requests.
-        self.assertEquals(multi_lock.overall_lock.limit, OVERALL_REQUESTS)
+        self.assertEqual(multi_lock.overall_lock.limit, OVERALL_REQUESTS)
 
         probe_function(mirror2, StringIO(), [], logging)
         # Now we have two mirrors to probe, but they have the same hostname,
         # so we'll still have a single semaphore in host_semaphores.
-        self.assertEquals(mirror2_host, mirror1_host)
-        self.assertEquals(len(request_manager.host_locks), 1)
+        self.assertEqual(mirror2_host, mirror1_host)
+        self.assertEqual(len(request_manager.host_locks), 1)
         multi_lock = request_manager.host_locks[mirror2_host]
-        self.assertEquals(multi_lock.host_lock.limit, PER_HOST_REQUESTS)
+        self.assertEqual(multi_lock.host_lock.limit, PER_HOST_REQUESTS)
 
         probe_function(mirror3, StringIO(), [], logging)
         # This third mirror is on a separate host, so we'll have a second
         # semaphore added to host_semaphores.
-        self.failUnless(mirror3_host != mirror1_host)
-        self.assertEquals(len(request_manager.host_locks), 2)
+        self.assertTrue(mirror3_host != mirror1_host)
+        self.assertEqual(len(request_manager.host_locks), 2)
         multi_lock = request_manager.host_locks[mirror3_host]
-        self.assertEquals(multi_lock.host_lock.limit, PER_HOST_REQUESTS)
+        self.assertEqual(multi_lock.host_lock.limit, PER_HOST_REQUESTS)
 
         # When using an http_proxy, even though we'll actually connect to the
         # proxy, we'll use the mirror's host as the key to find the semaphore
@@ -908,7 +908,7 @@
         orig_proxy = os.getenv('http_proxy')
         os.environ['http_proxy'] = 'http://squid.internal:3128/'
         probe_function(mirror3, StringIO(), [], logging)
-        self.assertEquals(len(request_manager.host_locks), 2)
+        self.assertEqual(len(request_manager.host_locks), 2)
         restore_http_proxy(orig_proxy)
 
 
 
=== modified file 'lib/lp/registry/tests/test_distroseries.py'
--- lib/lp/registry/tests/test_distroseries.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_distroseries.py	2018-01-02 16:24:23 +0000
@@ -222,7 +222,7 @@
         distroarchseries = self.factory.makeDistroArchSeries(
             distroseries=distroseries, architecturetag='i386',
             processor=processor)
-        self.assertEquals(
+        self.assertEqual(
             distroarchseries,
             distroseries.getDistroArchSeriesByProcessor(processor))
 
@@ -236,7 +236,7 @@
 
     def test_getDerivedSeries(self):
         dsp = self.factory.makeDistroSeriesParent()
-        self.assertEquals(
+        self.assertEqual(
             [dsp.derived_series], dsp.parent_series.getDerivedSeries())
 
     def test_registrant_owner_differ(self):
@@ -244,8 +244,8 @@
         # distribution's owner.
         registrant = self.factory.makePerson()
         distroseries = self.factory.makeDistroSeries(registrant=registrant)
-        self.assertEquals(distroseries.distribution.owner, distroseries.owner)
-        self.assertEquals(registrant, distroseries.registrant)
+        self.assertEqual(distroseries.distribution.owner, distroseries.owner)
+        self.assertEqual(registrant, distroseries.registrant)
         self.assertNotEqual(distroseries.registrant, distroseries.owner)
 
     def test_isDerivedSeries(self):
 
=== modified file 'lib/lp/registry/tests/test_distroseriesdifference.py'
--- lib/lp/registry/tests/test_distroseriesdifference.py	2014-11-09 11:48:34 +0000
+++ lib/lp/registry/tests/test_distroseriesdifference.py	2018-01-02 16:24:23 +0000
@@ -436,7 +436,7 @@
         packagesets = self._setupPackageSets(
             ds_diff, ds_diff.parent_series, 5)
         parent_packagesets = ds_diff.parent_packagesets
-        self.assertEquals(
+        self.assertEqual(
             sorted([packageset.name for packageset in packagesets]),
             [packageset.name for packageset in parent_packagesets])
 
@@ -445,7 +445,7 @@
         ds_diff = self.factory.makeDistroSeriesDifference()
         packagesets = self._setupPackageSets(
             ds_diff, ds_diff.derived_series, 5)
-        self.assertEquals(
+        self.assertEqual(
             sorted([packageset.name for packageset in packagesets]),
             [packageset.name for packageset in ds_diff.packagesets])
 
 
=== modified file 'lib/lp/registry/tests/test_distroseriesparent.py'
--- lib/lp/registry/tests/test_distroseriesparent.py	2014-07-30 23:48:56 +0000
+++ lib/lp/registry/tests/test_distroseriesparent.py	2018-01-02 16:24:23 +0000
@@ -135,7 +135,7 @@
 
     def assertCanEdit(self, dsp):
         dsp.initialized = False
-        self.assertEquals(False, dsp.initialized)
+        self.assertEqual(False, dsp.initialized)
 
     def test_distroseries_drivers_can_edit(self):
         # Test that distroseries drivers can edit the data.
 
=== modified file 'lib/lp/registry/tests/test_initderiveddistroseries.py'
--- lib/lp/registry/tests/test_initderiveddistroseries.py	2013-02-14 01:10:48 +0000
+++ lib/lp/registry/tests/test_initderiveddistroseries.py	2018-01-02 16:24:23 +0000
@@ -90,7 +90,7 @@
               p.getBuiltBinaries()[0].binarypackagerelease.version)
                  for p in pub_sources])
 
-        self.assertEquals(pack_versions, binaries)
+        self.assertEqual(pack_versions, binaries)
 
     def test_multiple_parents_binary_packages(self):
         # An initialization from many parents (using the package copier)
 
=== modified file 'lib/lp/registry/tests/test_milestonetag.py'
--- lib/lp/registry/tests/test_milestonetag.py	2015-01-29 14:14:01 +0000
+++ lib/lp/registry/tests/test_milestonetag.py	2018-01-02 16:24:23 +0000
@@ -38,7 +38,7 @@
 
     def test_no_tags(self):
         # Ensure a newly created milestone does not have associated tags.
-        self.assertEquals([], self.milestone.getTags())
+        self.assertEqual([], self.milestone.getTags())
 
     def test_tags_setting_and_retrieval(self):
         # Ensure tags are correctly saved and retrieved from the db.
@@ -59,7 +59,7 @@
         with person_logged_in(self.person):
             self.milestone.setTags(self.tags, self.person)
             self.milestone.setTags([], self.person)
-        self.assertEquals([], self.milestone.getTags())
+        self.assertEqual([], self.milestone.getTags())
 
     def test_user_metadata(self):
         # Ensure the correct user metadata is created when tags are added.
 
=== modified file 'lib/lp/registry/tests/test_person.py'
--- lib/lp/registry/tests/test_person.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_person.py	2018-01-02 16:24:23 +0000
@@ -807,7 +807,7 @@
         login(user.preferredemail.email)
         expected_error = ('This account cannot be deactivated because it owns '
                         'the following non-public products: private')
-        self.assertEquals([expected_error], user.canDeactivate())
+        self.assertEqual([expected_error], user.canDeactivate())
 
     def test_deactivate_copes_with_names_already_in_use(self):
         """When a user deactivates their account, their name is changed.
 
=== modified file 'lib/lp/registry/tests/test_person_vocabularies.py'
--- lib/lp/registry/tests/test_person_vocabularies.py	2012-08-13 21:33:47 +0000
+++ lib/lp/registry/tests/test_person_vocabularies.py	2018-01-02 16:24:23 +0000
@@ -108,7 +108,7 @@
         """
         if expected is not None:
             expected = expected % context.id
-        self.assertEquals(
+        self.assertEqual(
             expected,
             removeSecurityProxy(
                 self.getVocabulary(context))._karma_context_constraint)
@@ -233,7 +233,7 @@
 
         results = list(self.searchVocabulary(None, u'foobar'))
         with StormStatementRecorder() as recorder:
-            self.assertEquals(4, len(results))
+            self.assertEqual(4, len(results))
             for person in results:
                 self.assertEqual(
                     expected_nicks[person.id], person.ircnicknames)
 
=== modified file 'lib/lp/registry/tests/test_personroles.py'
--- lib/lp/registry/tests/test_personroles.py	2014-06-12 01:04:30 +0000
+++ lib/lp/registry/tests/test_personroles.py	2018-01-02 16:24:23 +0000
@@ -79,7 +79,7 @@
     def test_inTeam(self):
         # The method person.inTeam is available as the inTeam attribute.
         roles = IPersonRoles(self.person)
-        self.assertEquals(self.person.inTeam, roles.inTeam)
+        self.assertEqual(self.person.inTeam, roles.inTeam)
 
     def test_inTeam_works(self):
         # Make sure it actually works.
 
=== modified file 'lib/lp/registry/tests/test_personset.py'
--- lib/lp/registry/tests/test_personset.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_personset.py	2018-01-02 16:24:23 +0000
@@ -569,7 +569,7 @@
 
         ensured_person = self.person_set.ensurePerson(
             self.email_address, self.displayname, self.rationale)
-        self.assertEquals(testing_person.id, ensured_person.id)
+        self.assertEqual(testing_person.id, ensured_person.id)
         self.assertIsNot(
             ensured_person.displayname, self.displayname,
             'Person.displayname should not be overridden.')
@@ -655,10 +655,10 @@
             u'other-openid-identifier', '[e-mail]')
 
         self.assertEqual(other_person, person)
-        self.assert_(
-            u'other-openid-identifier' in [
-                identifier.identifier for identifier in removeSecurityProxy(
-                    person.account).openid_identifiers])
+        self.assertIn(
+            u'other-openid-identifier',
+            [identifier.identifier for identifier in removeSecurityProxy(
+                person.account).openid_identifiers])
 
 
 class TestPersonSetGetOrCreateSoftwareCenterCustomer(TestCaseWithFactory):
 
=== modified file 'lib/lp/registry/tests/test_pillar.py'
--- lib/lp/registry/tests/test_pillar.py	2016-04-14 05:16:26 +0000
+++ lib/lp/registry/tests/test_pillar.py	2018-01-02 16:24:23 +0000
@@ -40,7 +40,7 @@
             pillar.name for pillar in
             pillar_set.search(
                 getUtility(IPersonSet).getByName('mark'), 'lz', limit=5)]
-        self.assertEquals(result_names, [u'launchzap', u'lz-bar', u'lz-foo'])
+        self.assertEqual(result_names, [u'launchzap', u'lz-bar', u'lz-foo'])
 
 
 class TestPillarPerson(TestCaseWithFactory):
 
=== modified file 'lib/lp/registry/tests/test_prf_filter.py'
--- lib/lp/registry/tests/test_prf_filter.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_prf_filter.py	2018-01-02 16:24:23 +0000
@@ -22,7 +22,7 @@
         from logging import getLogger
         parent = getLogger("foo")
         f = Filter(log_parent=parent)
-        self.assertEquals(f.log.parent, parent)
+        self.assertEqual(f.log.parent, parent)
 
 
 class Filter_Init(unittest.TestCase):
@@ -31,15 +31,15 @@
         from lp.registry.scripts.productreleasefinder.filter import (
             Filter)
         f = Filter()
-        self.assertEquals(f.filters, [])
+        self.assertEqual(f.filters, [])
 
     def testFiltersPropertyGiven(self):
         """Filter constructor accepts argument to set filters property."""
         from lp.registry.scripts.productreleasefinder.filter import (
             Filter)
         f = Filter(["wibble"])
-        self.assertEquals(len(f.filters), 1)
-        self.assertEquals(f.filters[0], "wibble")
+        self.assertEqual(len(f.filters), 1)
+        self.assertEqual(f.filters[0], "wibble")
 
 
 class Filter_CheckUrl(unittest.TestCase):
@@ -48,7 +48,7 @@
         from lp.registry.scripts.productreleasefinder.filter import (
             Filter)
         f = Filter()
-        self.assertEquals(f.check("file:///subdir/file"), None)
+        self.assertEqual(f.check("file:///subdir/file"), None)
 
     def makeFilter(self, key, urlglob):
         from lp.registry.scripts.productreleasefinder.filter import (
@@ -59,27 +59,27 @@
     def testNotMatching(self):
         """Filter.check returns None if doesn't match a filter."""
         f = self.makeFilter("foo", "file:///subdir/w*")
-        self.assertEquals(f.check("file:///subdir/file"), None)
+        self.assertEqual(f.check("file:///subdir/file"), None)
 
     def testNoMatchingSlashes(self):
         """Filter.check that the glob does not match slashes."""
         f = self.makeFilter("foo", "file:///*l*")
-        self.assertEquals(f.check("file:///subdir/file"), None)
+        self.assertEqual(f.check("file:///subdir/file"), None)
 
     def testReturnsMatching(self):
         """Filter.check returns the matching keyword."""
         f = self.makeFilter("foo", "file:///subdir/f*e")
-        self.assertEquals(f.check("file:///subdir/file"), "foo")
+        self.assertEqual(f.check("file:///subdir/file"), "foo")
 
     def testGlobSubdir(self):
         # Filter.glob can contain slashes to match subdirs
         f = self.makeFilter("foo", "file:///sub*/f*e")
-        self.assertEquals(f.check("file:///subdir/file"), "foo")
+        self.assertEqual(f.check("file:///subdir/file"), "foo")
 
     def testReturnsNonMatchingBase(self):
         """Filter.check returns None if the base does not match."""
         f = self.makeFilter("foo", "http:f*e")
-        self.assertEquals(f.check("file:///subdir/file"), None)
+        self.assertEqual(f.check("file:///subdir/file"), None)
 
 
 class Filter_IsPossibleParentUrl(unittest.TestCase):
 
=== modified file 'lib/lp/registry/tests/test_prf_hose.py'
--- lib/lp/registry/tests/test_prf_hose.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_prf_hose.py	2018-01-02 16:24:23 +0000
@@ -29,7 +29,7 @@
         from logging import getLogger
         parent = getLogger("foo")
         h = Hose(log_parent=parent)
-        self.assertEquals(h.log.parent, parent)
+        self.assertEqual(h.log.parent, parent)
 
 
 class Hose_Filter(unittest.TestCase):
@@ -45,7 +45,7 @@
         """Hose creates Filter object with empty dictionary."""
         from lp.registry.scripts.productreleasefinder.hose import Hose
         h = Hose()
-        self.assertEquals(h.filter.filters, [])
+        self.assertEqual(h.filter.filters, [])
 
     def testCreatesFiltersWithGiven(self):
         """Hose creates Filter object with dictionary given."""
@@ -54,8 +54,8 @@
             FilterPattern)
         pattern = FilterPattern("foo", "http:e*")
         h = Hose([pattern])
-        self.assertEquals(len(h.filter.filters), 1)
-        self.assertEquals(h.filter.filters[0], pattern)
+        self.assertEqual(len(h.filter.filters), 1)
+        self.assertEqual(h.filter.filters[0], pattern)
 
 
 class Hose_Urls(unittest.TestCase):
@@ -74,7 +74,7 @@
         obs = Observer()
         instrument_method(obs, h, "reduceWork")
         h.__init__()
-        self.assert_(obs.called_it)
+        self.assertTrue(obs.called_it)
 
     def testPassesUrlList(self):
         """Hose constructor passes url list to reduceWork."""
@@ -94,8 +94,7 @@
         obs = Observer()
         instrument_method(obs, h, "reduceWork")
         h.__init__([pattern])
-        self.assertEquals(obs.args[0][0],
-                          ["http://archive.ubuntu.com/"])
+        self.assertEqual(obs.args[0][0], ["http://archive.ubuntu.com/"])
 
     def testSetsUrlProperty(self):
         """Hose constructor sets urls property to reduceWork return value."""
@@ -106,7 +105,7 @@
                 return "wibble"
 
         h = TestHose()
-        self.assertEquals(h.urls, "wibble")
+        self.assertEqual(h.urls, "wibble")
 
 
 class Hose_ReduceWork(unittest.TestCase):
@@ -114,24 +113,24 @@
         """Hose.reduceWork returns empty list when given one."""
         from lp.registry.scripts.productreleasefinder.hose import Hose
         h = Hose()
-        self.assertEquals(h.reduceWork([]), [])
+        self.assertEqual(h.reduceWork([]), [])
 
     def testReducedList(self):
         """Hose.reduceWork returns same list when nothing to do."""
         from lp.registry.scripts.productreleasefinder.hose import Hose
         h = Hose()
-        self.assertEquals(h.reduceWork(["http://localhost/", "file:///usr/"]),
-                          ["http://localhost/", "file:///usr/"])
+        self.assertEqual(h.reduceWork(["http://localhost/", "file:///usr/"]),
+                         ["http://localhost/", "file:///usr/"])
 
     def testReducesList(self):
         """Hose.reduceWork removes children elements from list."""
         from lp.registry.scripts.productreleasefinder.hose import Hose
         h = Hose()
-        self.assertEquals(h.reduceWork(["http://localhost/",
-                                        "http://localhost/foo/bar/",
-                                        "http://localhost/wibble/",
-                                        "file:///usr/"]),
-                          ["http://localhost/", "file:///usr/"])
+        self.assertEqual(h.reduceWork(["http://localhost/",
+                                       "http://localhost/foo/bar/",
+                                       "http://localhost/wibble/",
+                                       "file:///usr/"]),
+                         ["http://localhost/", "file:///usr/"])
 
 
 class Hose_LimitWalk(unittest.TestCase):
 
=== modified file 'lib/lp/registry/tests/test_prf_log.py'
--- lib/lp/registry/tests/test_prf_log.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_prf_log.py	2018-01-02 16:24:23 +0000
@@ -20,20 +20,20 @@
     def testNoParent(self):
         """get_logger works if no parent is given."""
         from lp.registry.scripts.productreleasefinder.log import get_logger
-        self.assertEquals(get_logger("test").name, "test")
+        self.assertEqual(get_logger("test").name, "test")
 
     def testRootParent(self):
         """get_logger works if root logger is given."""
         from lp.registry.scripts.productreleasefinder.log import get_logger
         from logging import root
-        self.assertEquals(get_logger("test", root).name, "test")
+        self.assertEqual(get_logger("test", root).name, "test")
 
     def testNormalParent(self):
         """get_logger works if non-root logger is given."""
         from lp.registry.scripts.productreleasefinder.log import get_logger
         from logging import getLogger
         parent = getLogger("foo")
-        self.assertEquals(get_logger("test", parent).name, "foo.test")
+        self.assertEqual(get_logger("test", parent).name, "foo.test")
 
     def testDeepParent(self):
         """get_logger works if deep-level logger is given."""
@@ -41,4 +41,4 @@
         from logging import getLogger
         getLogger("foo")
         parent2 = getLogger("foo.bar")
-        self.assertEquals(get_logger("test", parent2).name, "foo.bar.test")
+        self.assertEqual(get_logger("test", parent2).name, "foo.bar.test")
 
=== modified file 'lib/lp/registry/tests/test_prf_walker.py'
--- lib/lp/registry/tests/test_prf_walker.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_prf_walker.py	2018-01-02 16:24:23 +0000
@@ -29,7 +29,7 @@
         from logging import getLogger
         parent = getLogger("foo")
         w = WalkerBase("/", log_parent=parent)
-        self.assertEquals(w.log.parent, parent)
+        self.assertEqual(w.log.parent, parent)
 
 
 class WalkerBase_Base(TestCase):
@@ -37,22 +37,22 @@
     def testSetsBase(self):
         """WalkerBase sets the base property."""
         w = WalkerBase("ftp://localhost/")
-        self.assertEquals(w.base, "ftp://localhost/")
+        self.assertEqual(w.base, "ftp://localhost/")
 
     def testSetsScheme(self):
         """WalkerBase sets the scheme property."""
         w = WalkerBase("ftp://localhost/")
-        self.assertEquals(w.scheme, "ftp")
+        self.assertEqual(w.scheme, "ftp")
 
     def testSetsHost(self):
         """WalkerBase sets the host property."""
         w = WalkerBase("ftp://localhost/")
-        self.assertEquals(w.host, "localhost")
+        self.assertEqual(w.host, "localhost")
 
     def testNoScheme(self):
         """WalkerBase works when given a URL with no scheme."""
         w = WalkerBase("/")
-        self.assertEquals(w.host, "")
+        self.assertEqual(w.host, "")
 
     def testWrongScheme(self):
         """WalkerBase raises WalkerError when given an unhandled scheme."""
@@ -63,75 +63,75 @@
     def testUnescapesHost(self):
         """WalkerBase unescapes the host portion."""
         w = WalkerBase("ftp://local%40host/")
-        self.assertEquals(w.host, "local@host")
+        self.assertEqual(w.host, "local@host")
 
     def testNoUsername(self):
         """WalkerBase stores None when there is no username."""
         w = WalkerBase("ftp://localhost/")
-        self.assertEquals(w.user, None)
+        self.assertEqual(w.user, None)
 
     def testUsername(self):
         """WalkerBase splits out the username from the host portion."""
         w = WalkerBase("ftp://scott@localhost/")
-        self.assertEquals(w.user, "scott")
-        self.assertEquals(w.host, "localhost")
+        self.assertEqual(w.user, "scott")
+        self.assertEqual(w.host, "localhost")
 
     def testUnescapesUsername(self):
         """WalkerBase unescapes the username portion."""
         w = WalkerBase("ftp://scott%3awibble@localhost/")
-        self.assertEquals(w.user, "scott:wibble")
-        self.assertEquals(w.host, "localhost")
+        self.assertEqual(w.user, "scott:wibble")
+        self.assertEqual(w.host, "localhost")
 
     def testNoPassword(self):
         """WalkerBase stores None when there is no password."""
         w = WalkerBase("ftp://scott@localhost/")
-        self.assertEquals(w.passwd, None)
+        self.assertEqual(w.passwd, None)
 
     def testPassword(self):
         """WalkerBase splits out the password from the username."""
         w = WalkerBase("ftp://scott:wibble@localhost/")
-        self.assertEquals(w.user, "scott")
-        self.assertEquals(w.passwd, "wibble")
-        self.assertEquals(w.host, "localhost")
+        self.assertEqual(w.user, "scott")
+        self.assertEqual(w.passwd, "wibble")
+        self.assertEqual(w.host, "localhost")
 
     def testUnescapesPassword(self):
         """WalkerBase unescapes the password portion."""
         w = WalkerBase("ftp://scott:wibble%20wobble@localhost/")
-        self.assertEquals(w.user, "scott")
-        self.assertEquals(w.passwd, "wibble wobble")
-        self.assertEquals(w.host, "localhost")
+        self.assertEqual(w.user, "scott")
+        self.assertEqual(w.passwd, "wibble wobble")
+        self.assertEqual(w.host, "localhost")
 
     def testPathOnly(self):
         """WalkerBase stores the path if that's all there is."""
         w = WalkerBase("/path/to/something/")
-        self.assertEquals(w.path, "/path/to/something/")
+        self.assertEqual(w.path, "/path/to/something/")
 
     def testPathInUrl(self):
         """WalkerBase stores the path portion of a complete URL."""
         w = WalkerBase("ftp://localhost/path/to/something/")
-        self.assertEquals(w.path, "/path/to/something/")
+        self.assertEqual(w.path, "/path/to/something/")
 
     def testAddsSlashToPath(self):
         """WalkerBase adds a trailing slash to path if ommitted."""
         w = WalkerBase("ftp://localhost/path/to/something")
-        self.assertEquals(w.path, "/path/to/something/")
+        self.assertEqual(w.path, "/path/to/something/")
 
     def testUnescapesPath(self):
         """WalkerBase leaves the path escaped."""
         w = WalkerBase("ftp://localhost/some%20thing/")
-        self.assertEquals(w.path, "/some%20thing/")
+        self.assertEqual(w.path, "/some%20thing/")
 
     def testStoresQuery(self):
         """WalkerBase stores the query portion of a supporting URL."""
         w = WalkerBase("http://localhost/?foo")
-        self.assertEquals(w.query, "foo")
+        self.assertEqual(w.query, "foo")
 
     def testStoresFragment(self):
         """WalkerBase stores the fragment portion of a supporting URL."""
         WalkerBase.FRAGMENTS = True
         try:
             w = WalkerBase("http://localhost/#foo")
-            self.assertEquals(w.fragment, "foo")
+            self.assertEqual(w.fragment, "foo")
         finally:
             WalkerBase.FRAGMENTS = False
 
@@ -204,14 +204,14 @@
         from lp.registry.scripts.productreleasefinder.walker import (
             FTPWalker)
         w = FTPWalker("ftp://localhost/")
-        self.assertEquals(w.host, "localhost")
+        self.assertEqual(w.host, "localhost")
 
     def testNoScheme(self):
         """FTPWalker works when given a URL with no scheme."""
         from lp.registry.scripts.productreleasefinder.walker import (
             FTPWalker)
         w = FTPWalker("/")
-        self.assertEquals(w.host, "")
+        self.assertEqual(w.host, "")
 
     def testWrongScheme(self):
         """FTPWalker raises WalkerError when given an unhandled scheme."""
@@ -224,14 +224,14 @@
         from lp.registry.scripts.productreleasefinder.walker import (
             FTPWalker)
         w = FTPWalker("ftp://localhost/")
-        self.assertEquals(w.user, "anonymous")
+        self.assertEqual(w.user, "anonymous")
 
     def testNoPassword(self):
         """FTPWalker stores empty string when there is no password."""
         from lp.registry.scripts.productreleasefinder.walker import (
             FTPWalker)
         w = FTPWalker("ftp://scott@localhost/")
-        self.assertEquals(w.passwd, "")
+        self.assertEqual(w.passwd, "")
 
 
 class HTTPWalker_Base(TestCase):
@@ -241,21 +241,21 @@
         from lp.registry.scripts.productreleasefinder.walker import (
             HTTPWalker)
         w = HTTPWalker("http://localhost/")
-        self.assertEquals(w.host, "localhost")
+        self.assertEqual(w.host, "localhost")
 
     def testHttpsScheme(self):
         """HTTPWalker works when initialized with an https-scheme URL."""
         from lp.registry.scripts.productreleasefinder.walker import (
             HTTPWalker)
         w = HTTPWalker("https://localhost/")
-        self.assertEquals(w.host, "localhost")
+        self.assertEqual(w.host, "localhost")
 
     def testNoScheme(self):
         """HTTPWalker works when given a URL with no scheme."""
         from lp.registry.scripts.productreleasefinder.walker import (
             HTTPWalker)
         w = HTTPWalker("/")
-        self.assertEquals(w.host, "")
+        self.assertEqual(w.host, "")
 
     def testWrongScheme(self):
         """HTTPWalker raises WalkerError when given an unhandled scheme."""
@@ -274,13 +274,13 @@
         self.walker = HTTPWalker("http://localhost/")
 
     def verify_url_scheme_and_handler(self, scheme, handler):
-        self.assert_(scheme in self.walker.URL_SCHEMES)
-        self.assert_(handler in self.walker.handlers)
+        self.assertIn(scheme, self.walker.URL_SCHEMES)
+        self.assertIn(handler, self.walker.handlers)
         # urllib2 uses a naming convention to select the handler for
         # a URL scheme. This test is sanity to check to ensure that the
         # HTTPWalker's configuration of the OpenerDirector is will work.
         method_name = '%s_open' % scheme
-        self.assert_(safe_hasattr(handler, method_name))
+        self.assertTrue(safe_hasattr(handler, method_name))
 
     def test_http_request(self):
         import urllib2
@@ -503,7 +503,7 @@
         """combine_url constructs the URL correctly."""
         from lp.registry.scripts.productreleasefinder.walker import (
             combine_url)
-        self.assertEquals(combine_url("file:///base", "/subdir/", "file"),
-                          "file:///subdir/file")
-        self.assertEquals(combine_url("file:///base", "/subdir", "file"),
-                          "file:///subdir/file")
+        self.assertEqual(combine_url("file:///base", "/subdir/", "file"),
+                         "file:///subdir/file")
+        self.assertEqual(combine_url("file:///base", "/subdir", "file"),
+                         "file:///subdir/file")
 
=== modified file 'lib/lp/registry/tests/test_project_milestone.py'
--- lib/lp/registry/tests/test_project_milestone.py	2015-01-29 16:28:30 +0000
+++ lib/lp/registry/tests/test_project_milestone.py	2018-01-02 16:24:23 +0000
@@ -331,7 +331,7 @@
         try:
             milestone.createProductRelease(1, now)
         except MultipleProductReleases as e:
-            self.assert_(
+            self.assertTrue(
                 str(e), 'A milestone can only have one ProductRelease.')
 
     def test_inappropriate_deactivation_does_not_cause_an_OOPS(self):
 
=== modified file 'lib/lp/registry/tests/test_teammembership.py'
--- lib/lp/registry/tests/test_teammembership.py	2018-01-02 10:54:31 +0000
+++ lib/lp/registry/tests/test_teammembership.py	2018-01-02 16:24:23 +0000
@@ -277,7 +277,7 @@
     def assertParticipantsEquals(self, participant_names, team):
         """Assert that the participants names in team are the expected ones.
         """
-        self.assertEquals(
+        self.assertEqual(
             sorted(participant_names),
             sorted([participant.name for participant in team.allmembers]))
 
 
=== modified file 'lib/lp/scripts/tests/test_runlaunchpad.py'
--- lib/lp/scripts/tests/test_runlaunchpad.py	2018-01-02 10:54:31 +0000
+++ lib/lp/scripts/tests/test_runlaunchpad.py	2018-01-02 16:24:23 +0000
@@ -113,11 +113,11 @@
         instance_config_dir = os.path.join(self.config_root, 'test')
         os.mkdir(instance_config_dir)
         open(os.path.join(instance_config_dir, 'launchpad.conf'), 'w').close()
-        self.assertEquals(
+        self.assertEqual(
             ['-o', 'foo', '-C', '%s/launchpad.conf' % instance_config_dir],
             process_config_arguments(
                 ['-i', 'test', '-o', 'foo']))
-        self.assertEquals('test', config.instance_name)
+        self.assertEqual('test', config.instance_name)
 
 
 class ServersToStart(testtools.TestCase):
 
=== modified file 'lib/lp/scripts/utilities/js/tests/test_combo.py'
--- lib/lp/scripts/utilities/js/tests/test_combo.py	2016-01-26 15:47:37 +0000
+++ lib/lp/scripts/utilities/js/tests/test_combo.py	2018-01-02 16:24:23 +0000
@@ -90,7 +90,7 @@
 
     def test_parse_url_keeps_order(self):
         """Parsing a combo loader URL returns an ordered list of filenames."""
-        self.assertEquals(
+        self.assertEqual(
             parse_url(("http://yui.yahooapis.com/combo?"
                        "3.0.0/build/yui/yui-min.js&"
                        "3.0.0/build/oop/oop-min.js&"
@@ -124,7 +124,7 @@
                               "** oop-min **",
                               "// event-custom/event-custom-min.js",
                               "** event-custom-min **"))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(["yui/yui-min.js",
                                    "oop/oop-min.js",
                                    "event-custom/event-custom-min.js"],
@@ -163,7 +163,7 @@
              "/* editor/assets/skins/sam/editor.css */",
              ".yui-editor{background:url(editor/assets/skins/sam/img/bg.png)}",
              ))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(["widget/assets/skins/sam/widget.css",
                                    "editor/assets/skins/sam/editor.css"],
                                   root=test_dir)).strip(),
@@ -225,7 +225,7 @@
              "/* editor/assets/skins/sam/editor.css */",
              ".yui-editor{background:url(http://foo/static/img/bg.png)}",
              ))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(["widget/assets/skins/sam/widget.css",
                                    "editor/assets/skins/sam/editor.css"],
                                   root=test_dir)).strip(),
@@ -263,7 +263,7 @@
              '/* editor/assets/skins/sam/editor.css */',
              '.yui-editor{background:url("data:image/gif;base64,base64-data")}',
              ))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(["widget/assets/skins/sam/widget.css",
                                    "editor/assets/skins/sam/editor.css"],
                                   root=test_dir)).strip(),
@@ -306,7 +306,7 @@
              "   background: url(editor/assets/skins/sam/img/bg.png);",
              "}",
              ))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(["widget/assets/skins/sam/widget.css",
                                    "editor/assets/skins/sam/editor.css"],
                                   root=test_dir, minify_css=False)).strip(),
@@ -344,7 +344,7 @@
              "/* editor/assets/skins/sam/editor.css */",
              ".yui-editor{background:url(img/bg.png)}",
              ))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(["widget/assets/skins/sam/widget.css",
                                    "editor/assets/skins/sam/editor.css"],
                                   root=test_dir, rewrite_urls=False)).strip(),
@@ -388,7 +388,7 @@
              '   background: url("img/bg.png");',
              '}',
              ))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(["widget/assets/skins/sam/widget.css",
                                    "editor/assets/skins/sam/editor.css"],
                                   root=test_dir,
@@ -431,7 +431,7 @@
              ".yui-editor{background:url(" +
              "/static/editor/assets/skins/sam/img/bg.png)}",
              ))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(["widget/assets/skins/sam/widget.css",
                                    "editor/assets/skins/sam/editor.css"],
                                   root=test_dir,
@@ -459,7 +459,7 @@
                               "// [missing]",
                               "// event-custom/event-custom-min.js",
                               "** event-custom-min **"))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(["yui/yui-min.js",
                                    "oop/oop-min.js",
                                    "event-custom/event-custom-min.js"],
@@ -482,7 +482,7 @@
 
         expected = "\n".join(("// ../../oop/oop-min.js",
                               "// [missing]"))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files([hack], root=root)).strip(),
             expected)
 
@@ -498,7 +498,7 @@
 
         expected = "\n".join(("/* yui/base/base.css */",
                               ".foo{background-image:url(img.png)}"))
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files(files, root=test_dir)).strip(),
             expected)
 
@@ -510,7 +510,7 @@
         self.assertTrue(os.path.exists("/etc/passwd"))
 
         expected = ""
-        self.assertEquals(
+        self.assertEqual(
             "".join(combine_files([hack], root=test_dir)).strip(),
             expected)
 
@@ -548,8 +548,8 @@
             ["yui/yui-min.js",
              "oop/oop-min.js",
              "event-custom/event-custom-min.js"]), status=200)
-        self.assertEquals(res.headers, [("Content-Type", "text/javascript")])
-        self.assertEquals(res.body.strip(), expected)
+        self.assertEqual(res.headers, [("Content-Type", "text/javascript")])
+        self.assertEqual(res.body.strip(), expected)
 
     def test_combo_app_sets_content_type_for_css(self):
         """The WSGI App should set a proper Content-Type for CSS."""
@@ -562,11 +562,11 @@
 
         res = self.app.get("/?" + "&".join(
             ["widget/skin/sam/widget.css"]), status=200)
-        self.assertEquals(res.headers, [("Content-Type", "text/css")])
-        self.assertEquals(res.body.strip(), expected)
+        self.assertEqual(res.headers, [("Content-Type", "text/css")])
+        self.assertEqual(res.body.strip(), expected)
 
     def test_no_filename_gives_404(self):
         """If no filename is included, a 404 should be returned."""
         res = self.app.get("/", status=404)
-        self.assertEquals(res.headers, [("Content-Type", "text/plain")])
-        self.assertEquals(res.body, "Not Found")
+        self.assertEqual(res.headers, [("Content-Type", "text/plain")])
+        self.assertEqual(res.body, "Not Found")
 
=== modified file 'lib/lp/services/config/tests/test_config_lookup.py'
--- lib/lp/services/config/tests/test_config_lookup.py	2018-01-02 15:23:24 +0000
+++ lib/lp/services/config/tests/test_config_lookup.py	2018-01-02 16:24:23 +0000
@@ -113,7 +113,7 @@
 
     def test_find_config_dir(self):
         instance_config_dir = self.setUpInstanceConfig('an_instance')
-        self.assertEquals(
+        self.assertEqual(
             instance_config_dir, config.find_config_dir('an_instance'))
 
     def test_Config_uses_find_config_dir(self):
@@ -127,7 +127,7 @@
 
         # We don't care about ZConfig...
         cfg._setZConfig = lambda: None
-        self.assertEquals(2323, cfg.launchpad.default_batch_size)
+        self.assertEqual(2323, cfg.launchpad.default_batch_size)
 
 
 class TestGenerateOverrides(ConfigTestCase):
 
=== modified file 'lib/lp/services/database/tests/test_storm.py'
--- lib/lp/services/database/tests/test_storm.py	2014-01-30 15:04:06 +0000
+++ lib/lp/services/database/tests/test_storm.py	2018-01-02 16:24:23 +0000
@@ -13,6 +13,6 @@
 class TestStorm(TestCase):
     def test_has_cextensions(self):
         """Ensure Storm C extensions are being used."""
-        self.assert_(
+        self.assertTrue(
             storm.has_cextensions,
             'Storm not running with C extensions')
 
=== modified file 'lib/lp/services/features/tests/test_flags.py'
--- lib/lp/services/features/tests/test_flags.py	2014-02-26 00:25:03 +0000
+++ lib/lp/services/features/tests/test_flags.py	2018-01-02 16:24:23 +0000
@@ -188,7 +188,7 @@
         # no scopes need to be checked because it's just not in the database
         # and there's no point checking
         self.assertEqual({}, f._known_scopes._known)
-        self.assertEquals([], call_log)
+        self.assertEqual([], call_log)
         # however, this we have now negative-cached the flag
         self.assertEqual(dict(unknown=None), f.usedFlags())
         self.assertEqual(dict(), f.usedScopes())
@@ -215,14 +215,14 @@
     def test_getAllRulesAsTuples(self):
         source = self.makeSource()
         source.setAllRules(test_rules_list)
-        self.assertEquals(
+        self.assertEqual(
             test_rules_list,
             list(source.getAllRulesAsTuples()))
 
     def test_getAllRulesAsText(self):
         source = self.makeSource()
         source.setAllRules(test_rules_list)
-        self.assertEquals(
+        self.assertEqual(
             """\
 %s\tbeta_user\t100\t%s
 ui.icing\tnormal_user\t500\t5.0
@@ -241,7 +241,7 @@
 flag1   default     100   gamma with spaces
 flag2   default     0\ton
 """)
-        self.assertEquals({
+        self.assertEqual({
             'flag1': [
                 ('beta_user', 200, 'alpha'),
                 ('default', 100, 'gamma with spaces'),
 
=== modified file 'lib/lp/services/features/tests/test_scopes.py'
--- lib/lp/services/features/tests/test_scopes.py	2012-01-01 02:58:52 +0000
+++ lib/lp/services/features/tests/test_scopes.py	2018-01-02 16:24:23 +0000
@@ -100,7 +100,7 @@
             name = 'userslice:%d,%d' % (i, checks)
             if scope.lookup(name):
                 matches.append(name)
-        self.assertEquals(len(matches), 1, matches)
+        self.assertEqual(len(matches), 1, matches)
 
 
 class TestUserSliceScopeIntegration(TestCaseWithFactory):
@@ -123,5 +123,5 @@
                 value=u'not_value'),
             ]):
             with person_logged_in(person):
-                self.assertEquals(getFeatureFlag('test_feature'), 'on')
-                self.assertEquals(getFeatureFlag('test_not'), None)
+                self.assertEqual(getFeatureFlag('test_feature'), 'on')
+                self.assertEqual(getFeatureFlag('test_not'), None)
 
=== modified file 'lib/lp/services/features/tests/test_webapp.py'
--- lib/lp/services/features/tests/test_webapp.py	2012-01-01 02:58:52 +0000
+++ lib/lp/services/features/tests/test_webapp.py	2018-01-02 16:24:23 +0000
@@ -114,7 +114,7 @@
             with CaptureOops() as capture:
                 request = LaunchpadTestRequest()
 
-                self.assertEquals(getFeatureFlag('feature_name'), 'value')
+                self.assertEqual(getFeatureFlag('feature_name'), 'value')
 
                 # Simulate an oops here.
                 globalErrorUtility.raising(None, request=request)
@@ -122,5 +122,5 @@
                 oops = capture.oopses[0]
                 self.assertTrue('features.usedScopes' in oops)
                 self.assertTrue('features.usedFlags' in oops)
-                self.assertEquals(oops['features.usedFlags'],
-                    u"{'feature_name': u'value'}")
+                self.assertEqual(
+                    oops['features.usedFlags'], u"{'feature_name': u'value'}")
 
=== modified file 'lib/lp/services/librarian/tests/test_libraryfilealias.py'
--- lib/lp/services/librarian/tests/test_libraryfilealias.py	2012-01-01 02:58:52 +0000
+++ lib/lp/services/librarian/tests/test_libraryfilealias.py	2018-01-02 16:24:23 +0000
@@ -38,10 +38,10 @@
     def test_file_is_closed_at_the_end_of_transaction(self):
         """Non-DB instance state should be reset on transaction boundaries."""
         self.file_alias.open()
-        self.assertEquals(self.text_content[0:4], self.file_alias.read(4))
+        self.assertEqual(self.text_content[0:4], self.file_alias.read(4))
         # This should reset the file pointer.
         transaction.commit()
         # If the file pointer isn't reset, the next call to read() will return
         # the remaining content. If it's reset, the file will be auto-opened
         # and its whole content will be returned.
-        self.assertEquals(self.text_content, self.file_alias.read())
+        self.assertEqual(self.text_content, self.file_alias.read())
 
=== modified file 'lib/lp/services/librarian/tests/test_smoketest.py'
--- lib/lp/services/librarian/tests/test_smoketest.py	2015-10-14 15:22:01 +0000
+++ lib/lp/services/librarian/tests/test_smoketest.py	2018-01-02 16:24:23 +0000
@@ -78,7 +78,7 @@
         # the main function will return 0 (which will be used as the processes
         # exit code to signal success).
         with fake_urllib(GoodUrllib()):
-            self.assertEquals(
+            self.assertEqual(
                 do_smoketest(self.fake_librarian, self.fake_librarian,
                              output=StringIO()),
                 0)
@@ -87,7 +87,7 @@
         # If incorrect data is retrieved, the main function will return 1
         # (which will be used as the processes exit code to signal an error).
         with fake_urllib(BadUrllib()):
-            self.assertEquals(
+            self.assertEqual(
                 do_smoketest(self.fake_librarian, self.fake_librarian,
                              output=StringIO()),
                 1)
@@ -97,7 +97,7 @@
         # function will return 1 (which will be used as the processes exit
         # code to signal an error).
         with fake_urllib(ErrorUrllib()):
-            self.assertEquals(
+            self.assertEqual(
                 do_smoketest(self.fake_librarian, self.fake_librarian,
                              output=StringIO()),
                 1)
 
=== modified file 'lib/lp/services/librarianserver/tests/test_gc.py'
--- lib/lp/services/librarianserver/tests/test_gc.py	2018-01-02 10:54:31 +0000
+++ lib/lp/services/librarianserver/tests/test_gc.py	2018-01-02 16:24:23 +0000
@@ -299,10 +299,10 @@
         self.ztm.begin()
         # Make sure the well expired f1 is still there, but has no content.
         f1 = LibraryFileAlias.get(self.f1_id)
-        self.assert_(f1.content is None)
+        self.assertIsNone(f1.content)
         # f2 should still have content, as it isn't flagged for expiry.
         f2 = LibraryFileAlias.get(self.f2_id)
-        self.assert_(f2.content is not None)
+        self.assertIsNotNone(f2.content)
 
     def test_ignoreRecentlyExpiredAliases(self):
         # LibraryFileAlias records that have expired recently are not
@@ -323,10 +323,10 @@
         # Make sure f1 is still there and has content. This ensures that
         # our stay of execution is still working.
         f1 = LibraryFileAlias.get(self.f1_id)
-        self.assert_(f1.content is not None)
+        self.assertIsNotNone(f1.content)
         # f2 should still have content, as it isn't flagged for expiry.
         f2 = LibraryFileAlias.get(self.f2_id)
-        self.assert_(f2.content is not None)
+        self.assertIsNotNone(f2.content)
 
     def test_DeleteUnreferencedContent(self):
         # Merge the duplicates. This creates an
@@ -677,13 +677,13 @@
                 librariangc.delete_unwanted_files(self.con)
 
             # None of the rubbish we created has been touched.
-            self.assert_(os.path.isdir(noisedir1_path))
-            self.assert_(os.path.isdir(noisedir2_path))
-            self.assert_(os.path.isdir(noisedir3_path))
-            self.assert_(os.path.exists(noisefile1_path))
-            self.assert_(os.path.exists(noisefile2_path))
-            self.assert_(os.path.exists(noisefile3_path))
-            self.assert_(os.path.exists(migrated_path))
+            self.assertTrue(os.path.isdir(noisedir1_path))
+            self.assertTrue(os.path.isdir(noisedir2_path))
+            self.assertTrue(os.path.isdir(noisedir3_path))
+            self.assertTrue(os.path.exists(noisefile1_path))
+            self.assertTrue(os.path.exists(noisefile2_path))
+            self.assertTrue(os.path.exists(noisefile3_path))
+            self.assertTrue(os.path.exists(migrated_path))
         finally:
             # We need to clean this up ourselves, as the standard librarian
             # cleanup only removes files it knows where valid to avoid
 
=== modified file 'lib/lp/services/librarianserver/tests/test_swift.py'
--- lib/lp/services/librarianserver/tests/test_swift.py	2018-01-02 10:54:31 +0000
+++ lib/lp/services/librarianserver/tests/test_swift.py	2018-01-02 16:24:23 +0000
@@ -82,7 +82,7 @@
         # Confirm that files exist on disk where we expect to find them.
         for lfc in self.lfcs:
             path = swift.filesystem_path(lfc.id)
-            self.assert_(os.path.exists(path))
+            self.assertTrue(os.path.exists(path))
 
         # Copy all the files into Swift.
         swift.to_swift(log, remove_func=None)
@@ -90,7 +90,7 @@
         # Confirm that files exist on disk where we expect to find them.
         for lfc in self.lfcs:
             path = swift.filesystem_path(lfc.id)
-            self.assert_(os.path.exists(path))
+            self.assertTrue(os.path.exists(path))
 
         # Confirm all the files are also in Swift.
         swift_client = self.swift_fixture.connect()
@@ -113,7 +113,7 @@
         # Confirm that files exist on disk where we expect to find them.
         for lfc in self.lfcs:
             path = swift.filesystem_path(lfc.id)
-            self.assert_(os.path.exists(path))
+            self.assertTrue(os.path.exists(path))
 
         # Copy all the files into Swift.
         swift.to_swift(log, remove_func=swift.rename)
@@ -121,7 +121,7 @@
         # Confirm that files exist on disk where we expect to find them.
         for lfc in self.lfcs:
             path = swift.filesystem_path(lfc.id) + '.migrated'
-            self.assert_(os.path.exists(path))
+            self.assertTrue(os.path.exists(path))
 
         # Confirm all the files are also in Swift.
         swift_client = self.swift_fixture.connect()
@@ -144,7 +144,7 @@
         # Confirm that files exist on disk where we expect to find them.
         for lfc in self.lfcs:
             path = swift.filesystem_path(lfc.id)
-            self.assert_(os.path.exists(path))
+            self.assertTrue(os.path.exists(path))
 
         # Migrate all the files into Swift.
         swift.to_swift(log, remove_func=os.unlink)
@@ -200,7 +200,7 @@
         # to be done in multiple chunks, but small enough that it is
         # stored in Swift as a single object.
         size = LibrarianStorage.CHUNK_SIZE * 50
-        self.assert_(size > 1024 * 1024)
+        self.assertTrue(size > 1024 * 1024)
         expected_content = ''.join(chr(i % 256) for i in range(0, size))
         lfa_id = self.add_file('hello_bigboy.xls', expected_content)
         lfc = IStore(LibraryFileAlias).get(LibraryFileAlias, lfa_id).content
@@ -222,7 +222,7 @@
         # to be done in multiple chunks, but small enough that it is
         # stored in Swift as a single object.
         size = LibrarianStorage.CHUNK_SIZE * 50 + 1
-        self.assert_(size > 1024 * 1024)
+        self.assertTrue(size > 1024 * 1024)
         expected_content = ''.join(chr(i % 256) for i in range(0, size))
         lfa_id = self.add_file('hello_bigboy.xls', expected_content)
         lfc = IStore(LibraryFileAlias).get(LibraryFileAlias, lfa_id).content
@@ -241,7 +241,7 @@
         # Generate a blob large enough that Swift requires us to store
         # it as multiple objects plus a manifest.
         size = LibrarianStorage.CHUNK_SIZE * 50
-        self.assert_(size > 1024 * 1024)
+        self.assertTrue(size > 1024 * 1024)
         expected_content = ''.join(chr(i % 256) for i in range(0, size))
         lfa_id = self.add_file('hello_bigboy.xls', expected_content)
         lfa = IStore(LibraryFileAlias).get(LibraryFileAlias, lfa_id)
 
=== modified file 'lib/lp/services/mail/tests/test_sendmail.py'
--- lib/lp/services/mail/tests/test_sendmail.py	2015-07-08 16:05:11 +0000
+++ lib/lp/services/mail/tests/test_sendmail.py	2018-01-02 16:24:23 +0000
@@ -270,8 +270,8 @@
                 '[e-mail]', to_addresses,
                 subject, 'body', {'key': 'value'})
             ctrl.send()
-        self.assertEquals(fake_mailer.from_addr, '[e-mail]')
-        self.assertEquals(fake_mailer.to_addr, to_addresses)
+        self.assertEqual(fake_mailer.from_addr, '[e-mail]')
+        self.assertEqual(fake_mailer.to_addr, to_addresses)
         self.checkTimelineHasOneMailAction(ctl.timeline, subject=subject)
 
     def test_sendmail_with_email_header(self):
@@ -290,16 +290,16 @@
         message.add_header('To', '[e-mail]')
         with CaptureTimeline() as ctl:
             sendmail.sendmail(message)
-        self.assertEquals(fake_mailer.from_addr, '[e-mail]')
-        self.assertEquals(fake_mailer.to_addr, ['[e-mail]'])
+        self.assertEqual(fake_mailer.from_addr, '[e-mail]')
+        self.assertEqual(fake_mailer.to_addr, ['[e-mail]'])
         self.checkTimelineHasOneMailAction(ctl.timeline, subject=subject_str)
 
     def checkTimelineHasOneMailAction(self, timeline, subject):
         actions = timeline.actions
-        self.assertEquals(len(actions), 1)
+        self.assertEqual(len(actions), 1)
         a0 = actions[0]
-        self.assertEquals(a0.category, 'sendmail')
-        self.assertEquals(a0.detail, subject)
+        self.assertEqual(a0.category, 'sendmail')
+        self.assertEqual(a0.detail, subject)
         self.assertIsInstance(a0.detail, basestring)
 
 
 
=== modified file 'lib/lp/services/oauth/tests/test_oauth.py'
--- lib/lp/services/oauth/tests/test_oauth.py	2016-01-26 15:14:01 +0000
+++ lib/lp/services/oauth/tests/test_oauth.py	2018-01-02 16:24:23 +0000
@@ -33,7 +33,7 @@
         screen won't probably find the new request token on the slave store.
         """
         zstorm = getUtility(IZStorm)
-        self.assertEquals(
+        self.assertEqual(
             '%s-%s' % (MAIN_STORE, MASTER_FLAVOR),
             zstorm.get_name(self.class_._getStore()))
 
 
=== modified file 'lib/lp/services/oauth/tests/test_tokens.py'
--- lib/lp/services/oauth/tests/test_tokens.py	2016-01-26 15:14:01 +0000
+++ lib/lp/services/oauth/tests/test_tokens.py	2018-01-02 16:24:23 +0000
@@ -95,10 +95,10 @@
 
     def test_getByKey(self):
         token, _ = self.consumer.newRequestToken()
-        self.assertEquals(token, self.tokens.getByKey(token.key))
+        self.assertEqual(token, self.tokens.getByKey(token.key))
 
     def test_getByKey_returns_none_for_unused_key(self):
-        self.assertEquals(None, self.tokens.getByKey(u"no-such-token"))
+        self.assertIsNone(self.tokens.getByKey(u"no-such-token"))
 
 
 class TestRequestTokens(TestOAuth):
@@ -142,12 +142,10 @@
     def test_getRequestToken_for_wrong_consumer_returns_none(self):
         token_1, _ = self.consumer.newRequestToken()
         consumer_2 = self.factory.makeOAuthConsumer()
-        self.assertEquals(
-            None, consumer_2.getRequestToken(token_1.key))
+        self.assertIsNone(consumer_2.getRequestToken(token_1.key))
 
     def test_getRequestToken_for_nonexistent_key_returns_none(self):
-        self.assertEquals(
-            None, self.consumer.getRequestToken(u"no-such-token"))
+        self.assertIsNone(self.consumer.getRequestToken(u"no-such-token"))
 
     def test_isSecretValid(self):
         token, secret = self.consumer.newRequestToken()
@@ -161,16 +159,16 @@
         now = datetime.now(pytz.timezone('UTC'))
 
         self.assertTrue(request_token.is_reviewed)
-        self.assertEquals(request_token.person, self.person)
-        self.assertEquals(request_token.permission,
-                          OAuthPermission.WRITE_PUBLIC)
+        self.assertEqual(request_token.person, self.person)
+        self.assertEqual(request_token.permission,
+                         OAuthPermission.WRITE_PUBLIC)
 
         self.assertTrue(request_token.date_created <= now)
 
         # By default, reviewing a token does not set a context or
         # expiration date.
-        self.assertEquals(request_token.context, None)
-        self.assertEquals(request_token.date_expires, None)
+        self.assertIsNone(request_token.context)
+        self.assertIsNone(request_token.date_expires)
 
     def test_token_review_as_unauthorized(self):
         request_token, _ = self.consumer.newRequestToken()
@@ -179,8 +177,8 @@
         # This token has been reviewed, but it may not be used for any
         # purpose.
         self.assertTrue(request_token.is_reviewed)
-        self.assertEquals(request_token.permission,
-                          OAuthPermission.UNAUTHORIZED)
+        self.assertEqual(request_token.permission,
+                         OAuthPermission.UNAUTHORIZED)
 
     def test_review_with_expiration_date(self):
         # A request token may be associated with an expiration date
@@ -189,7 +187,7 @@
         request_token.review(
             self.person, OAuthPermission.WRITE_PUBLIC,
             date_expires=self.in_a_while)
-        self.assertEquals(request_token.date_expires, self.in_a_while)
+        self.assertEqual(request_token.date_expires, self.in_a_while)
 
     def test_review_with_expiration_date_in_the_past(self):
         # The expiration date, like the permission and context, is
@@ -203,7 +201,7 @@
         request_token.review(
             self.person, OAuthPermission.WRITE_PUBLIC,
             date_expires=self.a_long_time_ago)
-        self.assertEquals(request_token.date_expires, self.a_long_time_ago)
+        self.assertEqual(request_token.date_expires, self.a_long_time_ago)
         self.assertFalse(request_token.is_expired)
 
     def _reviewed_token_for_context(self, context_factory):
@@ -220,21 +218,21 @@
         # product.
         token, name = self._reviewed_token_for_context(
             self.factory.makeProduct)
-        self.assertEquals(token.context.name, name)
+        self.assertEqual(token.context.name, name)
 
     def test_review_with_project_group_context(self):
         # When reviewing a request token, the context may be set to a
         # project group.
         token, name = self._reviewed_token_for_context(
             self.factory.makeProject)
-        self.assertEquals(token.context.name, name)
+        self.assertEqual(token.context.name, name)
 
     def test_review_with_distrosourcepackage_context(self):
         # When reviewing a request token, the context may be set to a
         # distribution source package.
         token, name = self._reviewed_token_for_context(
             self.factory.makeDistributionSourcePackage)
-        self.assertEquals(token.context.name, name)
+        self.assertEqual(token.context.name, name)
 
     def test_expired_request_token_cant_be_reviewed(self):
         """An expired request token can't be reviewed."""
@@ -247,21 +245,21 @@
     def test_get_request_tokens_for_person(self):
         """It's possible to get a person's request tokens."""
         person = self.factory.makePerson()
-        self.assertEquals(person.oauth_request_tokens.count(), 0)
+        self.assertEqual(person.oauth_request_tokens.count(), 0)
         for i in range(0, 3):
             self.factory.makeOAuthRequestToken(reviewed_by=person)
-        self.assertEquals(person.oauth_request_tokens.count(), 3)
+        self.assertEqual(person.oauth_request_tokens.count(), 3)
 
     def test_expired_request_token_disappears_from_list(self):
         person = self.factory.makePerson()
-        self.assertEquals(person.oauth_request_tokens.count(), 0)
+        self.assertEqual(person.oauth_request_tokens.count(), 0)
         request_token = self.factory.makeOAuthRequestToken(reviewed_by=person)
-        self.assertEquals(person.oauth_request_tokens.count(), 1)
+        self.assertEqual(person.oauth_request_tokens.count(), 1)
 
         login_person(person)
         request_token.date_expires = self.a_long_time_ago
 
-        self.assertEquals(person.oauth_request_tokens.count(), 0)
+        self.assertEqual(person.oauth_request_tokens.count(), 0)
 
 
 class TestAccessTokens(TestOAuth):
@@ -292,18 +290,17 @@
         request_token, access_token, _ = (
             self._exchange_request_token_for_access_token())
 
-        self.assertEquals(request_token.consumer, access_token.consumer)
+        self.assertEqual(request_token.consumer, access_token.consumer)
 
         # An access token inherits its permission from the request
         # token that created it. But an access token's .permission is
         # an AccessLevel object, not an OAuthPermission. The only real
         # difference is that there's no AccessLevel corresponding to
         # OAuthPermission.UNAUTHORIZED.
-        self.assertEquals(
-            access_token.permission, AccessLevel.WRITE_PRIVATE)
+        self.assertEqual(access_token.permission, AccessLevel.WRITE_PRIVATE)
 
-        self.assertEquals(None, access_token.context)
-        self.assertEquals(None, access_token.date_expires)
+        self.assertIsNone(access_token.context)
+        self.assertIsNone(access_token.date_expires)
 
     def test_access_token_field_inheritance(self):
         # Make sure that specific fields like context and expiration
@@ -314,15 +311,13 @@
             self.person, OAuthPermission.WRITE_PRIVATE,
             context=context, date_expires=self.in_a_while)
         access_token, _ = request_token.createAccessToken()
-        self.assertEquals(request_token.context, access_token.context)
-        self.assertEquals(
-            request_token.date_expires, access_token.date_expires)
+        self.assertEqual(request_token.context, access_token.context)
+        self.assertEqual(request_token.date_expires, access_token.date_expires)
 
     def test_request_token_disappears_when_exchanged(self):
         request_token, access_token, _ = (
             self._exchange_request_token_for_access_token())
-        self.assertEquals(
-            None, self.consumer.getRequestToken(request_token.key))
+        self.assertIsNone(self.consumer.getRequestToken(request_token.key))
 
     def test_cant_exchange_unreviewed_request_token(self):
         # An unreviewed request token cannot be exchanged for an access token.
@@ -367,21 +362,21 @@
     def test_get_access_tokens_for_person(self):
         """It's possible to get a person's access tokens."""
         person = self.factory.makePerson()
-        self.assertEquals(person.oauth_access_tokens.count(), 0)
+        self.assertEqual(person.oauth_access_tokens.count(), 0)
         for i in range(0, 3):
             self.factory.makeOAuthAccessToken(self.consumer, person)
-        self.assertEquals(person.oauth_access_tokens.count(), 3)
+        self.assertEqual(person.oauth_access_tokens.count(), 3)
 
     def test_expired_access_token_disappears_from_list(self):
         person = self.factory.makePerson()
-        self.assertEquals(person.oauth_access_tokens.count(), 0)
+        self.assertEqual(person.oauth_access_tokens.count(), 0)
         access_token, _ = self.factory.makeOAuthAccessToken(
             self.consumer, person)
-        self.assertEquals(person.oauth_access_tokens.count(), 1)
+        self.assertEqual(person.oauth_access_tokens.count(), 1)
 
         login_person(access_token.person)
         access_token.date_expires = self.a_long_time_ago
-        self.assertEquals(person.oauth_access_tokens.count(), 0)
+        self.assertEqual(person.oauth_access_tokens.count(), 0)
 
 
 class TestHelperFunctions(TestOAuth):
@@ -394,11 +389,11 @@
         # If there's no token for user/consumer key/permission/context,
         # one is created.
         person = self.factory.makePerson()
-        self.assertEquals(person.oauth_access_tokens.count(), 0)
+        self.assertEqual(person.oauth_access_tokens.count(), 0)
         oauth_access_token_for(
             self.consumer.key, person, OAuthPermission.WRITE_PUBLIC,
             self.context)
-        self.assertEquals(person.oauth_access_tokens.count(), 1)
+        self.assertEqual(person.oauth_access_tokens.count(), 1)
 
     def test_oauth_access_token_string_permission(self):
         """You can pass in a string instead of an OAuthPermission."""
 
=== modified file 'lib/lp/services/openid/tests/test_baseopenidstore.py'
--- lib/lp/services/openid/tests/test_baseopenidstore.py	2013-06-20 05:50:00 +0000
+++ lib/lp/services/openid/tests/test_baseopenidstore.py	2018-01-02 16:24:23 +0000
@@ -29,12 +29,12 @@
                 'handle', 'secret', 42, 600, 'HMAC-SHA1'))
         db_assoc = IMasterStore(self.store.Association).get(
             self.store.Association, (u'server-url\xA9', u'handle'))
-        self.assertEquals(db_assoc.server_url, u'server-url\xA9')
-        self.assertEquals(db_assoc.handle, u'handle')
-        self.assertEquals(db_assoc.secret, 'secret')
-        self.assertEquals(db_assoc.issued, 42)
-        self.assertEquals(db_assoc.lifetime, 600)
-        self.assertEquals(db_assoc.assoc_type, u'HMAC-SHA1')
+        self.assertEqual(db_assoc.server_url, u'server-url\xA9')
+        self.assertEqual(db_assoc.handle, u'handle')
+        self.assertEqual(db_assoc.secret, 'secret')
+        self.assertEqual(db_assoc.issued, 42)
+        self.assertEqual(db_assoc.lifetime, 600)
+        self.assertEqual(db_assoc.assoc_type, u'HMAC-SHA1')
 
     def test_storeAssociation_update_existing(self):
         self.store.storeAssociation('server-url', Association(
@@ -58,15 +58,15 @@
 
         assoc = self.store.getAssociation('server-url', 'handle')
         self.assertIsInstance(assoc, Association)
-        self.assertEquals(assoc.handle, 'handle')
-        self.assertEquals(assoc.secret, 'secret')
-        self.assertEquals(assoc.issued, timestamp)
-        self.assertEquals(assoc.lifetime, 600)
-        self.assertEquals(assoc.assoc_type, 'HMAC-SHA1')
+        self.assertEqual(assoc.handle, 'handle')
+        self.assertEqual(assoc.secret, 'secret')
+        self.assertEqual(assoc.issued, timestamp)
+        self.assertEqual(assoc.lifetime, 600)
+        self.assertEqual(assoc.assoc_type, 'HMAC-SHA1')
 
     def test_getAssociation_unknown(self):
         assoc = self.store.getAssociation('server-url', 'unknown')
-        self.assertEquals(assoc, None)
+        self.assertEqual(assoc, None)
 
     def test_getAssociation_expired(self):
         lifetime = 600
@@ -76,7 +76,7 @@
         # The association is not returned because it is out of date.
         # Further more, it is removed from the database.
         assoc = self.store.getAssociation('server-url', 'handle')
-        self.assertEquals(assoc, None)
+        self.assertEqual(assoc, None)
 
         store = IMasterStore(self.store.Association)
         db_assoc = store.get(
@@ -99,13 +99,13 @@
         timestamp = int(time.time())
         self.store.storeAssociation('server-url', Association(
                 'handle', 'secret', timestamp, 600, 'HMAC-SHA1'))
-        self.assertEquals(
+        self.assertEqual(
             self.store.removeAssociation('server-url', 'handle'), True)
-        self.assertEquals(
+        self.assertEqual(
             self.store.getAssociation('server-url', 'handle'), None)
 
     def test_removeAssociation_unknown(self):
-        self.assertEquals(
+        self.assertEqual(
             self.store.removeAssociation('server-url', 'unknown'),
             False)
 
@@ -141,7 +141,7 @@
         self.store.storeAssociation('server-url', Association(
                 'handle2', 'secret', timestamp, 200, 'HMAC-SHA1'))
 
-        self.assertEquals(self.store.cleanupAssociations(), 1)
+        self.assertEqual(self.store.cleanupAssociations(), 1)
 
         # The second (non-expired) association is left behind.
         self.assertNotEqual(
 
=== modified file 'lib/lp/services/profile/tests.py'
--- lib/lp/services/profile/tests.py	2013-04-10 09:12:32 +0000
+++ lib/lp/services/profile/tests.py	2018-01-02 16:24:23 +0000
@@ -209,7 +209,7 @@
         self.pushProfilingConfig(profiling_allowed='True')
         profile.start_request(self._get_start_event('/++profile++show/'))
         self.assertIsInstance(profile._profilers.profiler, profile.Profiler)
-        self.assertEquals(set(profile._profilers.actions), set(('show', )))
+        self.assertEqual(set(profile._profilers.actions), set(('show', )))
 
     def test_optional_profiling_with_callgrind_request_starts_profiling(self):
         # If profiling is allowed and a request with the "callgrind" marker
@@ -217,7 +217,7 @@
         self.pushProfilingConfig(profiling_allowed='True')
         profile.start_request(self._get_start_event('/++profile++callgrind/'))
         self.assertIsInstance(profile._profilers.profiler, profile.Profiler)
-        self.assertEquals(
+        self.assertEqual(
             set(profile._profilers.actions), set(('callgrind', )))
 
     def test_optional_profiling_with_log_request_starts_profiling(self):
@@ -226,7 +226,7 @@
         self.pushProfilingConfig(profiling_allowed='True')
         profile.start_request(self._get_start_event('/++profile++log/'))
         self.assertIsInstance(profile._profilers.profiler, profile.Profiler)
-        self.assertEquals(
+        self.assertEqual(
             set(profile._profilers.actions), set(('callgrind', )))
 
     def test_optional_profiling_with_combined_request_starts_profiling(self):
@@ -236,7 +236,7 @@
         profile.start_request(
             self._get_start_event('/++profile++callgrind&show/'))
         self.assertIsInstance(profile._profilers.profiler, profile.Profiler)
-        self.assertEquals(
+        self.assertEqual(
             set(profile._profilers.actions), set(('callgrind', 'show')))
 
     def test_optional_profiling_with_reversed_request_starts_profiling(self):
@@ -249,7 +249,7 @@
         profile.start_request(
             self._get_start_event('/++profile++show&callgrind'))
         self.assertIsInstance(profile._profilers.profiler, profile.Profiler)
-        self.assertEquals(
+        self.assertEqual(
             set(profile._profilers.actions), set(('callgrind', 'show')))
 
     def test_optional_profiling_with_pstats_request_starts_profiling(self):
@@ -260,7 +260,7 @@
             self._get_start_event('/++profile++pstats/'))
         self.assertIsInstance(profile._profilers.profiler,
                               profile.Profiler)
-        self.assertEquals(set(profile._profilers.actions), set(('pstats',)))
+        self.assertEqual(set(profile._profilers.actions), set(('pstats',)))
 
     def test_optional_profiling_with_log_pstats(self):
         # If profiling is allowed and a request with the "log" and "pstats"
@@ -270,7 +270,7 @@
         profile.start_request(
             self._get_start_event('/++profile++log&pstats/'))
         self.assertIsInstance(profile._profilers.profiler, profile.Profiler)
-        self.assertEquals(
+        self.assertEqual(
             set(profile._profilers.actions), set(('callgrind', 'pstats',)))
 
     def test_optional_profiling_with_callgrind_pstats(self):
@@ -282,7 +282,7 @@
             self._get_start_event('/++profile++pstats&callgrind/'))
         self.assertIsInstance(profile._profilers.profiler,
                               profile.Profiler)
-        self.assertEquals(
+        self.assertEqual(
             set(profile._profilers.actions), set(('pstats', 'callgrind')))
 
     def test_forced_profiling_registers_action(self):
@@ -291,7 +291,7 @@
             profiling_allowed='True', profile_all_requests='True')
         profile.start_request(self._get_start_event('/'))
         self.assertIsInstance(profile._profilers.profiler, profile.Profiler)
-        self.assertEquals(
+        self.assertEqual(
             set(profile._profilers.actions), set(('callgrind', )))
 
     def test_optional_profiling_with_wrong_request_helps(self):
@@ -300,7 +300,7 @@
         self.pushProfilingConfig(profiling_allowed='True')
         profile.start_request(self._get_start_event('/++profile++/'))
         self.assertIs(getattr(profile._profilers, 'profiler', None), None)
-        self.assertEquals(set(profile._profilers.actions), set(('help', )))
+        self.assertEqual(set(profile._profilers.actions), set(('help', )))
 
     def test_forced_profiling_with_wrong_request_helps(self):
         # If profiling is forced and a request with the marker URL segment
@@ -309,7 +309,7 @@
             profiling_allowed='True', profile_all_requests='True')
         profile.start_request(self._get_start_event('/++profile++/'))
         self.assertIsInstance(profile._profilers.profiler, profile.Profiler)
-        self.assertEquals(
+        self.assertEqual(
             set(profile._profilers.actions), set(('help', 'callgrind')))
 
     def test_memory_profile_start(self):
@@ -336,14 +336,14 @@
         self.pushProfilingConfig(profiling_allowed='True')
         profile.start_request(self._get_start_event('/++profile++sqltrace/'))
         self.assertIs(getattr(profile._profilers, 'profiler', None), None)
-        self.assertEquals(profile._profilers.actions, dict(sql=True))
+        self.assertEqual(profile._profilers.actions, dict(sql=True))
         self.assertEqual([], da.stop_sql_logging())
 
     def test_sql_start(self):
         self.pushProfilingConfig(profiling_allowed='True')
         profile.start_request(self._get_start_event('/++profile++sql/'))
         self.assertIs(getattr(profile._profilers, 'profiler', None), None)
-        self.assertEquals(profile._profilers.actions, dict(sql=False))
+        self.assertEqual(profile._profilers.actions, dict(sql=False))
         self.assertEqual([], da.stop_sql_logging())
 
     def test_sqltrace_filtered_start(self):
@@ -351,7 +351,7 @@
         profile.start_request(self._get_start_event(
             '/++profile++sqltrace:includes bugsubscription/'))
         self.assertIs(getattr(profile._profilers, 'profiler', None), None)
-        self.assertEquals(set(profile._profilers.actions), set(('sql', )))
+        self.assertEqual(set(profile._profilers.actions), set(('sql', )))
         data = profile._profilers.actions['sql']
         self.assertTrue(data['condition']('SELECT BUGSUBSCRIPTION FROM FOO'))
         self.assertEqual([], da.stop_sql_logging())
@@ -665,7 +665,7 @@
         self.pushProfilingConfig(profiling_allowed='True')
         request = self.endRequest('/++profile++show/no-such-file',
                                   KeyError('foo'))
-        self.assertEquals(request.oops['type'], 'KeyError')
+        self.assertEqual(request.oops['type'], 'KeyError')
         response = self.getAddedResponse(request)
         self.assertIn('Exception-Type: KeyError', response)
         self.assertCleanProfilerState()
@@ -696,7 +696,7 @@
             self.assertTrue(profile._profilers.profiling)
             self.assertIsInstance(
                 profile._profilers.profiler, profile.Profiler)
-            self.assertEquals(
+            self.assertEqual(
                 set(('show', 'callgrind', 'memory_profile_start')),
                 set(profile._profilers.actions))
 
 
=== modified file 'lib/lp/services/session/tests/test_session.py'
--- lib/lp/services/session/tests/test_session.py	2013-06-20 05:50:00 +0000
+++ lib/lp/services/session/tests/test_session.py	2018-01-02 16:24:23 +0000
@@ -26,7 +26,7 @@
             for cls in [SessionData, SessionPkgData]:
                 for obj in [cls, cls()]:
                     store = adapter(obj)
-                    self.assert_(
+                    self.assertTrue(
                         'session' in store.get_database()._dsn,
                         'Unknown store returned adapting %r to %r'
                         % (obj, adapter))
 
=== modified file 'lib/lp/services/tests/test_utils.py'
--- lib/lp/services/tests/test_utils.py	2014-08-29 01:34:04 +0000
+++ lib/lp/services/tests/test_utils.py	2018-01-02 16:24:23 +0000
@@ -200,7 +200,7 @@
         def function():
             pass
         function()
-        self.assertEquals(['before', 'after'], calls)
+        self.assertEqual(['before', 'after'], calls)
 
     def test_decorate_with_function(self):
         # The original function is actually called when we call the result of
@@ -211,7 +211,7 @@
         def function():
             calls.append('foo')
         function()
-        self.assertEquals(['foo'], calls)
+        self.assertEqual(['foo'], calls)
 
     def test_decorate_with_call_twice(self):
         # A function decorated with decorate_with can be called twice.
@@ -222,7 +222,7 @@
             calls.append('foo')
         function()
         function()
-        self.assertEquals(['foo', 'foo'], calls)
+        self.assertEqual(['foo', 'foo'], calls)
 
     def test_decorate_with_arguments(self):
         # decorate_with passes through arguments.
@@ -232,7 +232,7 @@
         def function(*args, **kwargs):
             calls.append((args, kwargs))
         function('foo', 'bar', qux=4)
-        self.assertEquals([(('foo', 'bar'), {'qux': 4})], calls)
+        self.assertEqual([(('foo', 'bar'), {'qux': 4})], calls)
 
     def test_decorate_with_name_and_docstring(self):
         # decorate_with preserves function names and docstrings.
 
=== modified file 'lib/lp/services/twistedsupport/tests/test_processmonitor.py'
--- lib/lp/services/twistedsupport/tests/test_processmonitor.py	2018-01-02 10:54:31 +0000
+++ lib/lp/services/twistedsupport/tests/test_processmonitor.py	2018-01-02 16:24:23 +0000
@@ -370,7 +370,7 @@
         d = run_process_with_timeout(('true',))
 
         def check_success_result(result):
-            self.assertEquals(result, None, "Success result is not None.")
+            self.assertEqual(result, None, "Success result is not None.")
 
         d.addCallback(check_success_result)
         return d
 
=== modified file 'lib/lp/services/verification/browser/tests/test_logintoken.py'
--- lib/lp/services/verification/browser/tests/test_logintoken.py	2016-11-03 15:07:36 +0000
+++ lib/lp/services/verification/browser/tests/test_logintoken.py	2018-01-02 16:24:23 +0000
@@ -70,9 +70,9 @@
         harness.submit('cancel', {})
         actions = harness.view.actions.byname
         self.assertIn('field.actions.cancel', actions)
-        self.assertEquals(actions['field.actions.cancel'].submitted(), True)
-        self.assertEquals(harness.view.errors, [])
-        self.assertEquals(harness.view.next_url, self.expected_next_url)
+        self.assertEqual(actions['field.actions.cancel'].submitted(), True)
+        self.assertEqual(harness.view.errors, [])
+        self.assertEqual(harness.view.next_url, self.expected_next_url)
 
 
 class TestClaimTeamView(TestCaseWithFactory):
@@ -101,9 +101,9 @@
             requester=self.claimer, requesteremail=None,
             email=self.claimee_email, tokentype=LoginTokenType.TEAMCLAIM)
         msgs = self._claimToken(token1)
-        self.assertEquals([u'Team claimed successfully'], msgs)
+        self.assertEqual([u'Team claimed successfully'], msgs)
         msgs = self._claimToken(token2)
-        self.assertEquals(
+        self.assertEqual(
             [u'claimee has already been converted to a team.'], msgs)
 
 
 
=== modified file 'lib/lp/services/verification/tests/test_token_creation.py'
--- lib/lp/services/verification/tests/test_token_creation.py	2014-09-01 10:20:01 +0000
+++ lib/lp/services/verification/tests/test_token_creation.py	2018-01-02 16:24:23 +0000
@@ -12,4 +12,4 @@
 
     def test_length(self):
         token = create_token(99)
-        self.assertEquals(len(token), 99)
+        self.assertEqual(len(token), 99)
 
=== modified file 'lib/lp/services/webapp/tests/test_authentication.py'
--- lib/lp/services/webapp/tests/test_authentication.py	2014-06-27 07:58:42 +0000
+++ lib/lp/services/webapp/tests/test_authentication.py	2018-01-02 16:24:23 +0000
@@ -38,15 +38,15 @@
         # included in the OAuth calculations.
         headers = OAuthRequest._split_header(
             'OAuth realm="foo", oauth_consumer_key="justtesting"')
-        self.assertEquals(headers,
+        self.assertEqual(headers,
             {'oauth_consumer_key': 'justtesting'})
         headers = OAuthRequest._split_header(
             'OAuth oauth_consumer_key="justtesting"')
-        self.assertEquals(headers,
+        self.assertEqual(headers,
             {'oauth_consumer_key': 'justtesting'})
         headers = OAuthRequest._split_header(
             'OAuth oauth_consumer_key="justtesting", realm="realm"')
-        self.assertEquals(headers,
+        self.assertEqual(headers,
             {'oauth_consumer_key': 'justtesting'})
 
 
 
=== modified file 'lib/lp/services/webapp/tests/test_authutility.py'
--- lib/lp/services/webapp/tests/test_authutility.py	2016-09-21 02:50:41 +0000
+++ lib/lp/services/webapp/tests/test_authutility.py	2018-01-02 16:24:23 +0000
@@ -91,8 +91,8 @@
 
     def test_unauthenticatedPrincipal(self):
         authsvc, request = self._make(None, None)
-        self.assert_(isinstance(authsvc.unauthenticatedPrincipal(),
-                                UnauthenticatedPrincipal))
+        self.assertTrue(isinstance(authsvc.unauthenticatedPrincipal(),
+                                   UnauthenticatedPrincipal))
 
     def test_unauthorized(self):
         authsvc, request = self._make('bruce', 'test')
@@ -127,7 +127,7 @@
             exception = self.assertRaises(
                 AssertionError, authsvc._authenticateUsingBasicAuth,
                 credentials, request)
-            self.assertEquals(
+            self.assertEqual(
                 "Attempted to use basic auth when it is disabled",
                 str(exception))
         finally:
 
=== modified file 'lib/lp/services/webapp/tests/test_batching.py'
--- lib/lp/services/webapp/tests/test_batching.py	2016-02-05 16:51:12 +0000
+++ lib/lp/services/webapp/tests/test_batching.py	2018-01-02 16:24:23 +0000
@@ -459,7 +459,7 @@
         resultset = self.makeStormResultSet()
         range_factory = StormRangeFactory(resultset, self.logError)
         [where_clause] = range_factory.whereExpressions([Person.id], [1])
-        self.assertEquals('(Person.id) > (1)', compile(where_clause))
+        self.assertEqual('(Person.id) > (1)', compile(where_clause))
 
     def test_whereExpressions_desc(self):
         """For descending sort order, whereExpressions() returns the
@@ -469,7 +469,7 @@
         range_factory = StormRangeFactory(resultset, self.logError)
         [where_clause] = range_factory.whereExpressions(
             [Desc(Person.id)], [1])
-        self.assertEquals('(Person.id) < (1)', compile(where_clause))
+        self.assertEqual('(Person.id) < (1)', compile(where_clause))
 
     def test_whereExpressions__two_sort_columns_asc_asc(self):
         """If the ascending sort columns c1, c2 and the memo values
@@ -483,7 +483,7 @@
         range_factory = StormRangeFactory(resultset, self.logError)
         [where_clause] = range_factory.whereExpressions(
             [Person.id, Person.name], [1, 'foo'])
-        self.assertEquals(
+        self.assertEqual(
             "(Person.id, Person.name) > (1, E'foo')", compile(where_clause))
 
     def test_whereExpressions__two_sort_columns_desc_desc(self):
@@ -498,7 +498,7 @@
         range_factory = StormRangeFactory(resultset, self.logError)
         [where_clause] = range_factory.whereExpressions(
             [Desc(Person.id), Desc(Person.name)], [1, 'foo'])
-        self.assertEquals(
+        self.assertEqual(
             "(Person.id, Person.name) < (1, E'foo')", compile(where_clause))
 
     def test_whereExpressions__two_sort_columns_asc_desc(self):
@@ -516,10 +516,10 @@
         range_factory = StormRangeFactory(resultset, self.logError)
         [where_clause_1, where_clause_2] = range_factory.whereExpressions(
             [Person.id, Desc(Person.name)], [1, 'foo'])
-        self.assertEquals(
+        self.assertEqual(
             "Person.id = ? AND ((Person.name) < (E'foo'))",
             compile(where_clause_1))
-        self.assertEquals('(Person.id) > (1)', compile(where_clause_2))
+        self.assertEqual('(Person.id) > (1)', compile(where_clause_2))
 
     def test_getSlice__forward_without_memo(self):
         resultset = self.makeStormResultSet()
 
=== modified file 'lib/lp/services/webapp/tests/test_breadcrumbs.py'
--- lib/lp/services/webapp/tests/test_breadcrumbs.py	2015-08-04 11:17:11 +0000
+++ lib/lp/services/webapp/tests/test_breadcrumbs.py	2018-01-02 16:24:23 +0000
@@ -67,14 +67,14 @@
         # Breadcrumb adapter will use 'mainsite' as the rootsite.
         cookbook = Cookbook()
         self.assertIs(cookbook.rootsite, None)
-        self.assertEquals(Breadcrumb(cookbook).rootsite, 'mainsite')
+        self.assertEqual(Breadcrumb(cookbook).rootsite, 'mainsite')
 
     def test_urldata_rootsite_is_honored(self):
         # When a class' ICanonicalUrlData defines a rootsite, our Breadcrumb
         # adapter will use it.
         cookbook = Cookbook()
         cookbook.rootsite = 'cooking'
-        self.assertEquals(Breadcrumb(cookbook).rootsite, 'cooking')
+        self.assertEqual(Breadcrumb(cookbook).rootsite, 'cooking')
 
 
 class TestExtraBreadcrumbForLeafPageOnHierarchyView(BaseBreadcrumbTestCase):
@@ -94,20 +94,20 @@
     def test_non_default_page(self):
         crumbs = self.getBreadcrumbsForObject(self.product, '+download')
         downloads_url = "%s/+download" % self.product_url
-        self.assertEquals(
+        self.assertEqual(
             [self.product_url, downloads_url],
             [crumb.url for crumb in crumbs])
-        self.assertEquals(
+        self.assertEqual(
             '%s project files' % self.product.displayname,
             crumbs[-1].text)
 
     def test_facet_default_page(self):
         crumbs = self.getBreadcrumbsForObject(self.product, '+bugs')
         bugs_url = self.product_url.replace('launchpad', 'bugs.launchpad')
-        self.assertEquals(
+        self.assertEqual(
             [self.product_url, bugs_url],
             [crumb.url for crumb in crumbs])
-        self.assertEquals('Bugs', crumbs[-1].text)
+        self.assertEqual('Bugs', crumbs[-1].text)
 
     def test_zope_i18n_Messages_are_interpolated(self):
         # Views can use zope.i18nmessageid.Message as their title when they
@@ -124,7 +124,7 @@
         request.traversed_objects = [self.product, test_view]
         hierarchy_view = Hierarchy(test_view, request)
         [breadcrumb] = hierarchy_view.makeBreadcrumbsForRequestedPage()
-        self.assertEquals(breadcrumb.text, 'breadcrumb test')
+        self.assertEqual(breadcrumb.text, 'breadcrumb test')
 
 
 class TestExtraFacetBreadcrumbsOnHierarchyView(BaseBreadcrumbTestCase):
@@ -151,14 +151,14 @@
 
     def test_root_on_mainsite(self):
         crumbs = self.getBreadcrumbsForUrl('http://launchpad.dev/')
-        self.assertEquals(crumbs, [])
+        self.assertEqual(crumbs, [])
 
     def test_product_on_mainsite(self):
         self.assertBreadcrumbUrls([self.product_url], self.product)
 
     def test_root_on_vhost(self):
         crumbs = self.getBreadcrumbsForUrl('http://bugs.launchpad.dev/')
-        self.assertEquals(crumbs, [])
+        self.assertEqual(crumbs, [])
 
     def test_product_on_vhost(self):
         self.assertBreadcrumbUrls(
 
=== modified file 'lib/lp/services/webapp/tests/test_error.py'
--- lib/lp/services/webapp/tests/test_error.py	2017-01-13 13:35:31 +0000
+++ lib/lp/services/webapp/tests/test_error.py	2018-01-02 16:24:23 +0000
@@ -56,17 +56,16 @@
     def test_without_oops_id(self):
         request = LaunchpadTestRequest()
         SystemErrorView(Exception(), request)
-        self.assertEquals(500, request.response.getStatus())
-        self.assertEquals(
-            None,
+        self.assertEqual(500, request.response.getStatus())
+        self.assertIsNone(
             request.response.getHeader('X-Lazr-OopsId', literal=True))
 
     def test_with_oops_id(self):
         request = LaunchpadTestRequest()
         request.oopsid = 'OOPS-1X1'
         SystemErrorView(Exception(), request)
-        self.assertEquals(500, request.response.getStatus())
-        self.assertEquals(
+        self.assertEqual(500, request.response.getStatus())
+        self.assertEqual(
             'OOPS-1X1',
             request.response.getHeader('X-Lazr-OopsId', literal=True))
 
@@ -224,7 +223,7 @@
     def test_disconnectionerror_view(self):
         request = LaunchpadTestRequest()
         DisconnectionErrorView(DisconnectionError(), request)
-        self.assertEquals(503, request.response.getStatus())
+        self.assertEqual(503, request.response.getStatus())
 
     def test_operationalerror_view_integration(self):
         # Test setup.
@@ -246,4 +245,4 @@
     def test_operationalerror_view(self):
         request = LaunchpadTestRequest()
         OperationalErrorView(OperationalError(), request)
-        self.assertEquals(503, request.response.getStatus())
+        self.assertEqual(503, request.response.getStatus())
 
=== modified file 'lib/lp/services/webapp/tests/test_haproxy.py'
--- lib/lp/services/webapp/tests/test_haproxy.py	2012-09-28 06:01:02 +0000
+++ lib/lp/services/webapp/tests/test_haproxy.py	2018-01-02 16:24:23 +0000
@@ -32,7 +32,7 @@
 
     def test_HAProxyStatusView_all_good_returns_200(self):
         result = self.http(u'GET /+haproxy HTTP/1.0', handle_errors=False)
-        self.assertEquals(200, result.getStatus())
+        self.assertEqual(200, result.getStatus())
 
     def test_authenticated_HAProxyStatusView_works(self):
         # We don't use authenticated requests, but this keeps us from
@@ -41,12 +41,12 @@
             u'GET /+haproxy HTTP/1.0\n'
             u'Authorization: Basic Zm9vLmJhckBjYW5vbmljYWwuY29tOnRlc3Q=\n',
             handle_errors=False)
-        self.assertEquals(200, result.getStatus())
+        self.assertEqual(200, result.getStatus())
 
     def test_HAProxyStatusView_going_down_returns_500(self):
         haproxy.set_going_down_flag(True)
         result = self.http(u'GET /+haproxy HTTP/1.0', handle_errors=False)
-        self.assertEquals(500, result.getStatus())
+        self.assertEqual(500, result.getStatus())
 
     def test_haproxy_url_uses_DatabaseBlocked_policy(self):
         request = LaunchpadTestRequest(environ={'PATH_INFO': '/+haproxy'})
@@ -56,9 +56,9 @@
     def test_switch_going_down_flag(self):
         haproxy.set_going_down_flag(True)
         haproxy.switch_going_down_flag()
-        self.assertEquals(False, haproxy.going_down_flag)
+        self.assertEqual(False, haproxy.going_down_flag)
         haproxy.switch_going_down_flag()
-        self.assertEquals(True, haproxy.going_down_flag)
+        self.assertEqual(True, haproxy.going_down_flag)
 
     def test_HAProxyStatusView_status_code_is_configurable(self):
         config.push('change_haproxy_status_code', dedent('''
@@ -68,4 +68,4 @@
         self.addCleanup(config.pop, 'change_haproxy_status_code')
         haproxy.set_going_down_flag(True)
         result = self.http(u'GET /+haproxy HTTP/1.0', handle_errors=False)
-        self.assertEquals(499, result.getStatus())
+        self.assertEqual(499, result.getStatus())
 
=== modified file 'lib/lp/services/webapp/tests/test_login.py'
--- lib/lp/services/webapp/tests/test_login.py	2016-05-27 09:57:43 +0000
+++ lib/lp/services/webapp/tests/test_login.py	2018-01-02 16:24:23 +0000
@@ -242,9 +242,9 @@
                 person.account, email=test_email)
         self.assertTrue(view.login_called)
         response = view.request.response
-        self.assertEquals(httplib.TEMPORARY_REDIRECT, response.getStatus())
-        self.assertEquals(view.request.form['starting_url'],
-                          response.getHeader('Location'))
+        self.assertEqual(httplib.TEMPORARY_REDIRECT, response.getStatus())
+        self.assertEqual(view.request.form['starting_url'],
+                         response.getHeader('Location'))
         # The 'last_write' flag was not updated (unlike in the other test
         # methods) because in this case we didn't have to create a
         # Person/Account entry, so it's ok for further requests to hit the
@@ -267,7 +267,7 @@
             'starting_url': 'http://launchpad.dev/after-login',
             'foo': 'bar',
         }
-        self.assertEquals(params, expected_params)
+        self.assertEqual(params, expected_params)
 
     def test_gather_params_with_unicode_data(self):
         # If the currently requested URL includes a query string, the
@@ -281,7 +281,7 @@
             environ={'PATH_INFO': '/'})
         view = OpenIDCallbackView(context=None, request=None)
         params = view._gather_params(request)
-        self.assertEquals(params['foo'], u'\u16dd')
+        self.assertEqual(params['foo'], u'\u16dd')
 
     def test_unexpected_multivalue_fields(self):
         # The parameter gatering doesn't expect to find multi-valued form
@@ -303,7 +303,7 @@
             form={'starting_url': 'http://launchpad.dev/after-login'})
         view = OpenIDCallbackView(context=None, request=None)
         url = view._get_requested_url(request)
-        self.assertEquals(url, 'http://example.com?foo=bar')
+        self.assertEqual(url, 'http://example.com?foo=bar')
 
     def test_open_id_callback_handles_query_string(self):
         # If the currently requested URL includes a query string, the
@@ -317,13 +317,13 @@
             environ={'PATH_INFO': '/'})
         view = FakeConsumerOpenIDCallbackView(object(), request)
         view.initialize()
-        self.assertEquals(
+        self.assertEqual(
             view.fake_consumer.params,
             {
                 'starting_url': 'http://launchpad.dev/after-login',
                 'foo': 'bar',
             })
-        self.assertEquals(
+        self.assertEqual(
             view.fake_consumer.requested_url, 'http://example.com?foo=bar')
 
     def test_unseen_identity(self):
@@ -343,12 +343,12 @@
         self.assertTrue(view.login_called)
         account = account_set.getByOpenIDIdentifier(identifier)
         self.assertIsNot(None, account)
-        self.assertEquals(AccountStatus.ACTIVE, account.status)
+        self.assertEqual(AccountStatus.ACTIVE, account.status)
         person = IPerson(account, None)
         self.assertIsNot(None, person)
-        self.assertEquals('Foo User', person.displayname)
-        self.assertEquals('[e-mail]',
-                          removeSecurityProxy(person.preferredemail).email)
+        self.assertEqual('Foo User', person.displayname)
+        self.assertEqual('[e-mail]',
+                         removeSecurityProxy(person.preferredemail).email)
 
         # We also update the last_write flag in the session, to make sure
         # further requests use the master DB and thus see the newly created
@@ -382,12 +382,12 @@
         identifiers = [i.identifier for i in account.openid_identifiers]
         self.assertIn(identifier, identifiers)
 
-        self.assertEquals(AccountStatus.ACTIVE, account.status)
-        self.assertEquals(
+        self.assertEqual(AccountStatus.ACTIVE, account.status)
+        self.assertEqual(
             email, removeSecurityProxy(person.preferredemail).email)
         person = IPerson(account, None)
         self.assertIsNot(None, person)
-        self.assertEquals('Test account', person.displayname)
+        self.assertEqual('Test account', person.displayname)
 
         # We also update the last_write flag in the session, to make sure
         # further requests use the master DB and thus see the newly created
@@ -411,11 +411,11 @@
             view, html = self._createAndRenderView(openid_response)
         self.assertTrue(view.login_called)
         response = view.request.response
-        self.assertEquals(httplib.TEMPORARY_REDIRECT, response.getStatus())
-        self.assertEquals(view.request.form['starting_url'],
-                          response.getHeader('Location'))
-        self.assertEquals(AccountStatus.ACTIVE, person.account.status)
-        self.assertEquals(email, person.preferredemail.email)
+        self.assertEqual(httplib.TEMPORARY_REDIRECT, response.getStatus())
+        self.assertEqual(view.request.form['starting_url'],
+                         response.getHeader('Location'))
+        self.assertEqual(AccountStatus.ACTIVE, person.account.status)
+        self.assertEqual(email, person.preferredemail.email)
         # We also update the last_write flag in the session, to make sure
         # further requests use the master DB and thus see the newly created
         # stuff.
@@ -440,8 +440,8 @@
         with SRegResponse_fromSuccessResponse_stubbed():
             view, html = self._createAndRenderView(openid_response)
         self.assertTrue(view.login_called)
-        self.assertEquals(AccountStatus.ACTIVE, person.account.status)
-        self.assertEquals(email, person.preferredemail.email)
+        self.assertEqual(AccountStatus.ACTIVE, person.account.status)
+        self.assertEqual(email, person.preferredemail.email)
         # We also update the last_write flag in the session, to make sure
         # further requests use the master DB and thus see the newly created
         # stuff.
@@ -579,9 +579,9 @@
             view_class=StubbedOpenIDCallbackViewLoggedIn)
         self.assertFalse(view.login_called)
         response = view.request.response
-        self.assertEquals(httplib.TEMPORARY_REDIRECT, response.getStatus())
-        self.assertEquals(view.request.form['starting_url'],
-                          response.getHeader('Location'))
+        self.assertEqual(httplib.TEMPORARY_REDIRECT, response.getStatus())
+        self.assertEqual(view.request.form['starting_url'],
+                         response.getHeader('Location'))
         notification_msg = view.request.response.notifications[0].message
         expected_msg = ('Your authentication failed but you were already '
                         'logged into Launchpad')
@@ -626,9 +626,9 @@
             form={'starting_url': self.STARTING_URL})
         view.initialize()
         view._redirect()
-        self.assertEquals(
+        self.assertEqual(
             httplib.TEMPORARY_REDIRECT, view.request.response.getStatus())
-        self.assertEquals(
+        self.assertEqual(
             view.request.response.getHeader('Location'), self.STARTING_URL)
 
     def test_open_id_callback_redirect_from_post(self):
@@ -640,9 +640,9 @@
             QUERY_STRING='starting_url=' + self.STARTING_URL)
         view.initialize()
         view._redirect()
-        self.assertEquals(
+        self.assertEqual(
             httplib.TEMPORARY_REDIRECT, view.request.response.getStatus())
-        self.assertEquals(
+        self.assertEqual(
             view.request.response.getHeader('Location'), self.STARTING_URL)
 
     def test_openid_callback_redirect_fallback(self):
@@ -652,9 +652,9 @@
         view.request = LaunchpadTestRequest(SERVER_URL=self.APPLICATION_URL)
         view.initialize()
         view._redirect()
-        self.assertEquals(
+        self.assertEqual(
             httplib.TEMPORARY_REDIRECT, view.request.response.getStatus())
-        self.assertEquals(
+        self.assertEqual(
             view.request.response.getHeader('Location'), self.APPLICATION_URL)
 
 
@@ -694,7 +694,7 @@
         self.assertIn('body onload', browser.contents)
         browser.getControl('Continue').click()
 
-        self.assertEquals('Login', browser.title)
+        self.assertEqual('Login', browser.title)
         fill_login_form_and_submit(browser, '[e-mail]')
         login_status = extract_text(
             find_tag_by_id(browser.contents, 'logincontrol'))
@@ -710,10 +710,10 @@
         replay_browser.open(callback_url)
         login_status = extract_text(
             find_tag_by_id(replay_browser.contents, 'logincontrol'))
-        self.assertEquals('Log in / Register', login_status)
+        self.assertEqual('Log in / Register', login_status)
         error_msg = find_tags_by_class(replay_browser.contents, 'error')[0]
-        self.assertEquals('Nonce already used or out of range',
-                          extract_text(error_msg))
+        self.assertEqual('Nonce already used or out of range',
+                         extract_text(error_msg))
 
 
 class FakeHTTPResponse:
@@ -743,8 +743,8 @@
         browser = TestBrowser()
         self.assertRaises(urllib2.HTTPError,
                           browser.open, 'http://launchpad.dev/+login')
-        self.assertEquals('503 Service Unavailable',
-                          browser.headers.get('status'))
+        self.assertEqual('503 Service Unavailable',
+                         browser.headers.get('status'))
         self.assertTrue(
             'OpenID Provider Is Unavailable at This Time' in browser.contents)
 
@@ -845,10 +845,10 @@
         self.assertIsNot(None, extensions)
         sreg_extension = extensions[0]
         self.assertIsInstance(sreg_extension, sreg.SRegRequest)
-        self.assertEquals(['email', 'fullname'],
-                          sorted(sreg_extension.allRequestedFields()))
-        self.assertEquals(sorted(sreg_extension.required),
-                          sorted(sreg_extension.allRequestedFields()))
+        self.assertEqual(['email', 'fullname'],
+                         sorted(sreg_extension.allRequestedFields()))
+        self.assertEqual(sorted(sreg_extension.required),
+                         sorted(sreg_extension.allRequestedFields()))
 
     def test_pape_extension_added_with_reauth_query(self):
         # We can signal that a request should be reauthenticated via
@@ -928,8 +928,8 @@
         # At this point browser.contents contains a hidden form which would've
         # been auto-submitted if we had in-browser JS support, but since we
         # don't we can easily inspect what's in the form.
-        self.assertEquals('%s/' % browser.rooturl,
-                          browser.getControl(name='openid.realm').value)
+        self.assertEqual('%s/' % browser.rooturl,
+                         browser.getControl(name='openid.realm').value)
 
     def test_realm_for_vhosts(self):
         browser = Browser()
@@ -937,9 +937,9 @@
         # At this point browser.contents contains a hidden form which would've
         # been auto-submitted if we had in-browser JS support, but since we
         # don't we can easily inspect what's in the form.
-        self.assertEquals('%s'
-                          % self.layer.appserver_root_url(ensureSlash=True),
-                          browser.getControl(name='openid.realm').value)
+        self.assertEqual('%s'
+                         % self.layer.appserver_root_url(ensureSlash=True),
+                         browser.getControl(name='openid.realm').value)
 
 
 def test_suite():
 
=== modified file 'lib/lp/services/webapp/tests/test_login_account.py'
--- lib/lp/services/webapp/tests/test_login_account.py	2018-01-02 10:54:31 +0000
+++ lib/lp/services/webapp/tests/test_login_account.py	2018-01-02 16:24:23 +0000
@@ -119,23 +119,22 @@
 
         # The view should have redirected us, with no actual response body.
 
-        self.assertEquals(self.request.response.getStatus(), 302)
-        self.assertEquals(result, '')
+        self.assertEqual(self.request.response.getStatus(), 302)
+        self.assertEqual(result, '')
 
         # We are redirecting to Loggerhead, to ask it to logout.
 
         location = lazr.uri.URI(self.request.response.getHeader('location'))
-        self.assertEquals(location.host, 'bazaar.launchpad.dev')
-        self.assertEquals(location.scheme, 'https')
-        self.assertEquals(location.path, '/+logout')
+        self.assertEqual(location.host, 'bazaar.launchpad.dev')
+        self.assertEqual(location.scheme, 'https')
+        self.assertEqual(location.path, '/+logout')
 
         # That page should then redirect to our OpenId provider to logout,
         # which we provide in our query string.  See
         # launchpad_loggerhead.tests.TestLogout for the pertinent tests.
 
         query = cgi.parse_qs(location.query)
-        self.assertEquals(
-            query['next_to'][0], 'http://testopenid.dev/+logout')
+        self.assertEqual(query['next_to'][0], 'http://testopenid.dev/+logout')
 
     def test_logging_in_and_logging_out_the_old_way(self):
         # A test showing that we can authenticate a request that had the
 
=== modified file 'lib/lp/services/webapp/tests/test_menu.py'
--- lib/lp/services/webapp/tests/test_menu.py	2013-02-06 04:22:43 +0000
+++ lib/lp/services/webapp/tests/test_menu.py	2018-01-02 16:24:23 +0000
@@ -51,17 +51,17 @@
         newInteraction()
         menu = TestMenu(object())
         menu._get_link('test_link')
-        self.assertEquals(menu.times_called, 1)
+        self.assertEqual(menu.times_called, 1)
         menu._get_link('test_link')
-        self.assertEquals(menu.times_called, 2)
+        self.assertEqual(menu.times_called, 2)
 
     def test_cache_when_there_is_a_request(self):
         login(ANONYMOUS)
         menu = TestMenu(object())
         menu._get_link('test_link')
-        self.assertEquals(menu.times_called, 1)
+        self.assertEqual(menu.times_called, 1)
         menu._get_link('test_link')
-        self.assertEquals(menu.times_called, 1)
+        self.assertEqual(menu.times_called, 1)
 
     def test_correct_value_is_cached(self):
         login(ANONYMOUS)
@@ -69,7 +69,7 @@
         link = menu._get_link('test_link')
         request = get_current_browser_request()
         cache = request.annotations.get(MENU_ANNOTATION_KEY)
-        self.assertEquals([link], cache.values())
+        self.assertEqual([link], cache.values())
 
     def test_cache_key_is_unique(self):