Diff
Modified: trunk/Source/WebKit/ChangeLog (284774 => 284775)
--- trunk/Source/WebKit/ChangeLog 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Source/WebKit/ChangeLog 2021-10-25 11:07:20 UTC (rev 284775)
@@ -1,3 +1,24 @@
+2021-10-25 Sam Sneddon <[email protected]>
+
+ [Python] rename assertEquals/assertNotEquals
+ https://bugs.webkit.org/show_bug.cgi?id=232214
+
+ Reviewed by Alexey Proskuryakov.
+
+ This is assert(Not)?Equals -> assert(\1)Equal
+
+ Python 3.11 (currently CPython main branch) removes the deprecated
+ aliases assertEquals/assertNotEquals. These have long been deprecated,
+ and the modern names exist all the way back to Python 2.7, hence there's
+ no reason not to switch.
+
+ * Scripts/webkit/messages_unittest.py:
+ (GeneratedFileContentsTest.assertGeneratedFileContentsEqual):
+ * Scripts/webkit/model_unittest.py:
+ * Scripts/webkit/parser_unittest.py:
+ (ParsingTest.check_message):
+ (ParsingTest.test_receiver):
+
2021-10-24 Wenson Hsieh <[email protected]>
RemoteRenderingBackend should not send IPC in the middle of destruction
Modified: trunk/Source/WebKit/Scripts/webkit/messages_unittest.py (284774 => 284775)
--- trunk/Source/WebKit/Scripts/webkit/messages_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Source/WebKit/Scripts/webkit/messages_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -84,9 +84,9 @@
expected_line_list = expected_file_contents.splitlines(False)
for index, actual_line in enumerate(actual_line_list):
- self.assertEquals(actual_line, expected_line_list[index])
+ self.assertEqual(actual_line, expected_line_list[index])
- self.assertEquals(len(actual_line_list), len(expected_line_list))
+ self.assertEqual(len(actual_line_list), len(expected_line_list))
except Exception:
sys.stderr.write('In expected file %s\n' % expected_file_name)
raise
Modified: trunk/Source/WebKit/Scripts/webkit/model_unittest.py (284774 => 284775)
--- trunk/Source/WebKit/Scripts/webkit/model_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Source/WebKit/Scripts/webkit/model_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -46,8 +46,8 @@
LoadURL(String url)
}"""
receiver = parser.parse(StringIO(contents))
- self.assertEquals(receiver.name, 'WebPage')
- self.assertEquals(receiver.messages[0].name, 'LoadURL')
+ self.assertEqual(receiver.name, 'WebPage')
+ self.assertEqual(receiver.messages[0].name, 'LoadURL')
other_contents = """
messages -> WebPage {
@@ -56,11 +56,11 @@
}"""
other_receiver = parser.parse(StringIO(other_contents))
- self.assertEquals(other_receiver.name, 'WebPage')
- self.assertEquals(other_receiver.messages[0].name, 'LoadURL')
- self.assertEquals(other_receiver.messages[1].name, 'LoadURL2')
+ self.assertEqual(other_receiver.name, 'WebPage')
+ self.assertEqual(other_receiver.messages[0].name, 'LoadURL')
+ self.assertEqual(other_receiver.messages[1].name, 'LoadURL2')
errors = model.check_global_model_inputs([receiver, other_receiver])
- self.assertEquals(len(errors), 1)
+ self.assertEqual(len(errors), 1)
self.assertTrue("Duplicate" in errors[0])
def test_mismatch_message_attribute_sync(self):
@@ -74,10 +74,10 @@
#endif
}"""
receiver = parser.parse(StringIO(contents))
- self.assertEquals(receiver.name, 'WebPage')
- self.assertEquals(receiver.messages[0].name, 'LoadURL')
+ self.assertEqual(receiver.name, 'WebPage')
+ self.assertEqual(receiver.messages[0].name, 'LoadURL')
errors = model.check_global_model_inputs([receiver])
- self.assertEquals(len(errors), 1)
+ self.assertEqual(len(errors), 1)
self.assertTrue("attribute mismatch" in errors[0])
Modified: trunk/Source/WebKit/Scripts/webkit/parser_unittest.py (284774 => 284775)
--- trunk/Source/WebKit/Scripts/webkit/parser_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Source/WebKit/Scripts/webkit/parser_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -316,32 +316,32 @@
self.receivers = [parse_receiver(expected_model['name']) for expected_model in _parsing_test_cases]
def check_message(self, message, expected_message):
- self.assertEquals(message.name, expected_message['name'])
- self.assertEquals(len(message.parameters), len(expected_message['parameters']))
+ self.assertEqual(message.name, expected_message['name'])
+ self.assertEqual(len(message.parameters), len(expected_message['parameters']))
for index, parameter in enumerate(message.parameters):
expected_parameter = expected_message['parameters'][index]
- self.assertEquals(parameter.type, expected_parameter[0])
- self.assertEquals(parameter.name, expected_parameter[1])
+ self.assertEqual(parameter.type, expected_parameter[0])
+ self.assertEqual(parameter.name, expected_parameter[1])
if len(expected_parameter) > 2:
- self.assertEquals(parameter.attributes, frozenset(expected_parameter[2]))
+ self.assertEqual(parameter.attributes, frozenset(expected_parameter[2]))
for attribute in expected_parameter[2]:
self.assertTrue(parameter.has_attribute(attribute))
else:
- self.assertEquals(parameter.attributes, frozenset())
+ self.assertEqual(parameter.attributes, frozenset())
if message.reply_parameters is not None:
for index, parameter in enumerate(message.reply_parameters):
- self.assertEquals(parameter.type, expected_message['reply_parameters'][index][0])
- self.assertEquals(parameter.name, expected_message['reply_parameters'][index][1])
+ self.assertEqual(parameter.type, expected_message['reply_parameters'][index][0])
+ self.assertEqual(parameter.name, expected_message['reply_parameters'][index][1])
else:
self.assertFalse('reply_parameters' in expected_message)
- self.assertEquals(message.condition, expected_message['conditions'])
+ self.assertEqual(message.condition, expected_message['conditions'])
def test_receiver(self):
"""Receiver should be parsed as expected"""
for receiver, expected_model in zip(self.receivers, _parsing_test_cases):
- self.assertEquals(receiver.name, expected_model['name'])
- self.assertEquals(receiver.condition, expected_model['conditions'])
- self.assertEquals(len(receiver.messages), len(expected_model['messages']))
+ self.assertEqual(receiver.name, expected_model['name'])
+ self.assertEqual(receiver.condition, expected_model['conditions'])
+ self.assertEqual(len(receiver.messages), len(expected_model['messages']))
for index, message in enumerate(receiver.messages):
self.check_message(message, expected_model['messages'][index])
Modified: trunk/Tools/ChangeLog (284774 => 284775)
--- trunk/Tools/ChangeLog 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/ChangeLog 2021-10-25 11:07:20 UTC (rev 284775)
@@ -1,3 +1,79 @@
+2021-10-25 Sam Sneddon <[email protected]>
+
+ [Python] rename assertEquals/assertNotEquals
+ https://bugs.webkit.org/show_bug.cgi?id=232214
+
+ Reviewed by Alexey Proskuryakov.
+
+ This is assert(Not)?Equals -> assert(\1)Equal
+
+ Python 3.11 (currently CPython main branch) removes the deprecated
+ aliases assertEquals/assertNotEquals. These have long been deprecated,
+ and the modern names exist all the way back to Python 2.7, hence there's
+ no reason not to switch.
+
+ * Scripts/libraries/webkitcorepy/webkitcorepy/tests/task_pool_unittest.py:
+ (TaskPoolUnittest.test_multiple):
+ * Scripts/webkitpy/common/attribute_saver_unittest.py:
+ (AttributeSaverTest.test_class):
+ (AttributeSaverTest.test_normal_default):
+ (AttributeSaverTest.test_normal_value):
+ (AttributeSaverTest.test_normal_value_on_exception):
+ (AttributeSaverTest.test_normal_value_on_normal_exit):
+ (AttributeSaverTest.test_normal_value_with_finally_on_exception):
+ (AttributeSaverTest.test_normal_value_with_finally_on_normal_exit):
+ (AttributeSaverTest.test_normal_value_with_else_on_exception):
+ (AttributeSaverTest.test_normal_value_with_else_on_normal_exit):
+ * Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py:
+ (StubRepositoryTest.test_find_checkout_root):
+ * Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py:
+ (TestConfigurationTest.test_eq):
+ * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
+ (MiscTests.test_parse_warnings_are_logged_if_not_in_lint_mode):
+ * Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py:
+ (SummarizedResultsTest.test_svn_revision_exists):
+ (SummarizedResultsTest.test_svn_revision):
+ (SummarizedResultsTest.test_svn_revision_git):
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (RunTest.test_tests_options):
+ * Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
+ (TestHttpServer.test_win32_start_and_stop):
+ * Scripts/webkitpy/port/driver_unittest.py:
+ * Scripts/webkitpy/port/gtk_unittest.py:
+ (GtkPortTest.test_gtk4_expectations_binary_only):
+ (GtkPortTest.test_gtk3_expectations_binary_only):
+ (GtkPortTest.test_gtk_expectations_both_binaries):
+ * Scripts/webkitpy/style/checkers/test_expectations_unittest.py:
+ (TestExpectationsTestCase.assert_lines_lint):
+ * Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
+ * Scripts/webkitpy/w3c/test_converter_unittest.py:
+ (verify_test_harness_paths):
+ * Scripts/webkitpy/w3c/test_exporter_unittest.py:
+ (TestExporterTest.test_export):
+ (TestExporterTest.test_export_with_specific_branch):
+ * Scripts/webkitpy/w3c/test_importer_unittest.py:
+ * Scripts/webkitpy/w3c/test_parser_unittest.py:
+ * Scripts/webkitpy/w3c/wpt_runner_unittest.py:
+ (WPTRunnerTest.MockSpawnWPT.__call__):
+ (WPTRunnerTest.test_prepare_wpt_checkout):
+ (WPTRunnerTest.test_prepare_wpt_checkout_specified_path):
+ * Scripts/webkitpy/xcode/device_type_unittest.py:
+ (DeviceTypeTest.test_iphone_initialization):
+ (DeviceTypeTest.test_ipad_initialization):
+ (DeviceTypeTest.test_generic_ios_device):
+ (DeviceTypeTest.test_watch_initialization):
+ (DeviceTypeTest.test_tv_initialization):
+ * Scripts/webkitpy/xcode/sdk_unittest.py:
+ (SDKTest.test_iphoneos):
+ (SDKTest.test_iphonesim):
+ (SDKTest.test_macos):
+ (SDKTest.test_appletvos):
+ (SDKTest.test_appletvsim):
+ (SDKTest.test_watchos):
+ (SDKTest.test_watchsimulator):
+ (SDKTest.test_prodos):
+ * Scripts/webkitpy/xcode/simulated_device_unittest.py:
+
2021-10-24 Arcady Goldmints-Orlov <[email protected]>
REGRESSION(r282686) [GTK] Tests are flaky due to spurious "MainFrameView: mouseEnteredContentArea" messages in the log
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/task_pool_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/task_pool_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/task_pool_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -110,7 +110,7 @@
pool.wait()
lines = captured.stdout.getvalue().splitlines()
- self.assertEquals(sorted(lines), ['action({})'.format(character) for character in self.alphabet])
+ self.assertEqual(sorted(lines), ['action({})'.format(character) for character in self.alphabet])
self.assertEqual(
sorted(captured.webkitcorepy.log.getvalue().splitlines()),
sorted(['worker/{} starting'.format(number) for number in range(4)] + ['worker/{} stopping'.format(number) for number in range(4)]),
Modified: trunk/Tools/Scripts/webkitpy/common/attribute_saver_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/common/attribute_saver_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/common/attribute_saver_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -38,90 +38,90 @@
def test_class(self):
obj = self.SimpleTestClass()
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
def test_normal_default(self):
obj = self.SimpleTestClass()
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
with AttributeSaver(obj, "value"):
- self.assertEquals(obj.value, None)
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, None)
+ self.assertEqual(obj.value, 0)
def test_normal_value(self):
obj = self.SimpleTestClass()
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
with AttributeSaver(obj, "value", 1):
- self.assertEquals(obj.value, 1)
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 1)
+ self.assertEqual(obj.value, 0)
def test_normal_value_on_exception(self):
with self.assertRaises(RuntimeError):
obj = self.SimpleTestClass()
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
try:
with AttributeSaver(obj, "value", 1):
- self.assertEquals(obj.value, 1)
+ self.assertEqual(obj.value, 1)
raise RuntimeError()
except:
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
raise
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
def test_normal_value_on_normal_exit(self):
obj = self.SimpleTestClass()
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
try:
with AttributeSaver(obj, "value", 1):
- self.assertEquals(obj.value, 1)
+ self.assertEqual(obj.value, 1)
except:
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
raise
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
def test_normal_value_with_finally_on_exception(self):
with self.assertRaises(RuntimeError):
obj = self.SimpleTestClass()
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
try:
with AttributeSaver(obj, "value", 1):
- self.assertEquals(obj.value, 1)
+ self.assertEqual(obj.value, 1)
raise RuntimeError()
finally:
- self.assertEquals(obj.value, 0)
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
+ self.assertEqual(obj.value, 0)
def test_normal_value_with_finally_on_normal_exit(self):
obj = self.SimpleTestClass()
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
try:
with AttributeSaver(obj, "value", 1):
- self.assertEquals(obj.value, 1)
+ self.assertEqual(obj.value, 1)
finally:
- self.assertEquals(obj.value, 0)
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
+ self.assertEqual(obj.value, 0)
def test_normal_value_with_else_on_exception(self):
with self.assertRaises(RuntimeError):
obj = self.SimpleTestClass()
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
try:
with AttributeSaver(obj, "value", 1):
- self.assertEquals(obj.value, 1)
+ self.assertEqual(obj.value, 1)
raise RuntimeError()
except IOError:
self.assertFalse(True)
else:
- self.assertEquals(obj.value, 0)
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
+ self.assertEqual(obj.value, 0)
def test_normal_value_with_else_on_normal_exit(self):
obj = self.SimpleTestClass()
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
try:
with AttributeSaver(obj, "value", 1):
- self.assertEquals(obj.value, 1)
+ self.assertEqual(obj.value, 1)
except IOError:
self.assertFalse(True)
else:
- self.assertEquals(obj.value, 0)
- self.assertEquals(obj.value, 0)
+ self.assertEqual(obj.value, 0)
+ self.assertEqual(obj.value, 0)
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/stub_repository_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -67,7 +67,7 @@
def test_find_checkout_root(self):
host = StubRepositoryTest.mock_host_for_stub_repository()
repository = StubRepository(cwd=host.filesystem.getcwd(), filesystem=host.filesystem, executive=host.executive)
- self.assertEquals(repository.find_checkout_root(path=host.filesystem.join('TestDirectory', 'TestDirectory2', 'TestDirectory3')), host.filesystem.join(host.filesystem.getcwd(), 'TestDirectory', 'TestDirectory2'))
+ self.assertEqual(repository.find_checkout_root(path=host.filesystem.join('TestDirectory', 'TestDirectory2', 'TestDirectory3')), host.filesystem.join(host.filesystem.getcwd(), 'TestDirectory', 'TestDirectory2'))
def test_find_checkout_root_failure(self):
host = StubRepositoryTest.mock_host_for_stub_repository()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -86,7 +86,7 @@
def test_eq(self):
self.assertEqual(TestConfiguration('xp', 'x86', 'release'), TestConfiguration('xp', 'x86', 'release'))
- self.assertNotEquals(TestConfiguration('xp', 'x86', 'release'), TestConfiguration('xp', 'x86', 'debug'))
+ self.assertNotEqual(TestConfiguration('xp', 'x86', 'release'), TestConfiguration('xp', 'x86', 'debug'))
def test_values(self):
config = TestConfiguration('xp', 'x86', 'release')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -199,7 +199,7 @@
def test_parse_warnings_are_logged_if_not_in_lint_mode(self):
with OutputCapture() as captured:
self.parse_exp('-- this should be a syntax error', is_lint_mode=False)
- self.assertNotEquals(captured.root.log.getvalue(), '')
+ self.assertNotEqual(captured.root.log.getvalue(), '')
def test_error_on_different_platform(self):
# parse_exp uses a Windows port. Assert errors on Mac show up in lint mode.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -158,19 +158,19 @@
def test_svn_revision_exists(self):
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
- self.assertNotEquals(summary['revision'], '')
+ self.assertNotEqual(summary['revision'], '')
def test_svn_revision(self):
with mocks.local.Svn(path='/'), mocks.local.Git():
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
- self.assertEquals(summary['revision'], '6')
+ self.assertEqual(summary['revision'], '6')
def test_svn_revision_git(self):
with mocks.local.Svn(), mocks.local.Git(path='/', git_svn=True), OutputCapture():
self.port._options.builder_name = 'dummy builder'
summary = summarized_results(self.port, expected=False, passing=False, flaky=False)
- self.assertEquals(summary['revision'], '9')
+ self.assertEqual(summary['revision'], '9')
def test_summarized_results_wontfix(self):
self.port._options.builder_name = 'dummy builder'
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -822,9 +822,9 @@
details, _, _ = logging_run(['failures/expected/timeout.html',
'failures/unexpected/timeout.html'],
host=host)
- self.assertEquals(details.initial_results.slow_tests,
+ self.assertEqual(details.initial_results.slow_tests,
{'failures/unexpected/timeout.html'})
- self.assertEquals(details.retry_results.slow_tests,
+ self.assertEqual(details.retry_results.slow_tests,
{'failures/unexpected/timeout.html'})
def serial_test_no_http_and_force(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -88,7 +88,7 @@
server._is_server_running_on_all_ports = lambda: True
server.start()
- self.assertNotEquals(host.executive.calls, [])
+ self.assertNotEqual(host.executive.calls, [])
def wait_for_action(action):
if action():
Modified: trunk/Tools/Scripts/webkitpy/port/driver_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/port/driver_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/port/driver_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -298,7 +298,7 @@
driver = Driver(port, 0, pixel_tests=True)
driver.start(True, [])
last_tmpdir = port._filesystem.last_tmpdir
- self.assertNotEquals(last_tmpdir, None)
+ self.assertNotEqual(last_tmpdir, None)
driver.stop()
self.assertFalse(port._filesystem.isdir(last_tmpdir))
@@ -401,7 +401,7 @@
driver = Driver(port, None, pixel_tests=False)
driver.start(True, [])
environ_driver = driver._setup_environ_for_test()
- self.assertNotEquals(environ_driver['HOME'], environ_user['HOME'])
+ self.assertNotEqual(environ_driver['HOME'], environ_user['HOME'])
self.assertIn(str(driver._driver_tempdir), environ_driver['HOME'])
self.assertNotIn(str(driver._driver_tempdir), environ_user['HOME'])
self.assertTrue(port._filesystem.isdir(environ_driver['HOME']))
Modified: trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -101,7 +101,7 @@
"/mock-build/lib/libwebkit2gtk-5.0.so": ""
})
with OutputCapture() as _:
- self.assertEquals(port.expectations_files(),
+ self.assertEqual(port.expectations_files(),
['/mock-checkout/LayoutTests/TestExpectations',
'/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
'/mock-checkout/LayoutTests/platform/glib/TestExpectations',
@@ -115,7 +115,7 @@
})
with OutputCapture() as _:
- self.assertEquals(port.expectations_files(),
+ self.assertEqual(port.expectations_files(),
['/mock-checkout/LayoutTests/TestExpectations',
'/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
'/mock-checkout/LayoutTests/platform/glib/TestExpectations',
@@ -129,9 +129,9 @@
})
with OutputCapture() as captured:
- self.assertEquals(port.expectations_files(),
+ self.assertEqual(port.expectations_files(),
['/mock-checkout/LayoutTests/TestExpectations',
'/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
'/mock-checkout/LayoutTests/platform/glib/TestExpectations',
'/mock-checkout/LayoutTests/platform/gtk/TestExpectations'])
- self.assertEquals(captured.root.log.getvalue(), 'Multiple WebKit2GTK libraries found. Skipping GTK4 detection.\n')
+ self.assertEqual(captured.root.log.getvalue(), 'Multiple WebKit2GTK libraries found. Skipping GTK4 detection.\n')
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -95,7 +95,7 @@
elif expected_output:
self.assertEqual(expected_output, self._error_collector.get_errors())
else:
- self.assertNotEquals('', self._error_collector.get_errors())
+ self.assertNotEqual('', self._error_collector.get_errors())
# Note that a patch might change a line that introduces errors elsewhere, but we
# don't want to lint the whole file (it can unfairly punish patches for pre-existing errors).
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -115,7 +115,7 @@
step._tool.filesystem.write_text_file(path, start_file)
step._resolve_existing_entry(path)
actual_output = step._tool.filesystem.read_text_file(path)
- self.assertEquals(actual_output, end_file)
+ self.assertEqual(actual_output, end_file)
def test_ensure_bug_url(self):
step = PrepareChangeLog(MockTool(), MockOptions())
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -368,13 +368,13 @@
# Verify the original paths are gone, and the new paths are present.
orig_path_pattern = re.compile('\"/resources/testharness')
- self.assertEquals(len(converted.findAll(src="" 0, 'testharness src path was not converted')
- self.assertEquals(len(converted.findAll(href="" 0, 'testharness href path was not converted')
+ self.assertEqual(len(converted.findAll(src="" 0, 'testharness src path was not converted')
+ self.assertEqual(len(converted.findAll(href="" 0, 'testharness href path was not converted')
new_relpath = os.path.relpath(resources_dir, test_path).replace(os.sep, '/')
relpath_pattern = re.compile(new_relpath)
- self.assertEquals(len(converted.findAll(src="" num_src_paths, 'testharness src relative path not correct')
- self.assertEquals(len(converted.findAll(href="" num_href_paths, 'testharness href relative path not correct')
+ self.assertEqual(len(converted.findAll(src="" num_src_paths, 'testharness src relative path not correct')
+ self.assertEqual(len(converted.findAll(href="" num_href_paths, 'testharness href relative path not correct')
def verify_prefixed_properties(self, converted, test_properties):
self.assertEqual(len(set(converted[0])), len(set(test_properties)), 'Incorrect number of properties converted')
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -130,9 +130,9 @@
options = parse_args(['test_exporter.py', '-g', 'HEAD', '-b', '1234', '-c', '-n', 'USER', '-t', 'TOKEN'])
exporter = WebPlatformTestExporter(host, options, TestExporterTest.MockGit, TestExporterTest.MockBugzilla, MockWPTGitHub, TestExporterTest.MockWPTLinter)
exporter.do_export()
- self.assertEquals(exporter._github.calls, ['create_pr', 'add_label "webkit-export"'])
+ self.assertEqual(exporter._github.calls, ['create_pr', 'add_label "webkit-export"'])
self.assertTrue('WebKit export' in exporter._github.pull_requests_created[0][1])
- self.assertEquals(exporter._git.calls, [
+ self.assertEqual(exporter._git.calls, [
'/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests',
'fetch',
'checkout master',
@@ -148,11 +148,11 @@
'delete branch wpt-export-for-webkit-1234',
'checkout master',
'reset hard origin/master'])
- self.assertEquals(exporter._bugzilla.calls, [
+ self.assertEqual(exporter._bugzilla.calls, [
'fetch bug 1234',
'Append https://github.com/web-platform-tests/wpt/pull/5678 to see also list',
'post comment to bug 1234 : Submitted web-platform-tests pull request: https://github.com/web-platform-tests/wpt/pull/5678'])
- self.assertEquals(mock_linter.calls, ['/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests', 'lint'])
+ self.assertEqual(mock_linter.calls, ['/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests', 'lint'])
def test_export_with_specific_branch(self):
host = TestExporterTest.MyMockHost()
@@ -160,7 +160,7 @@
options = parse_args(['test_exporter.py', '-g', 'HEAD', '-b', '1234', '-c', '-n', 'USER', '-t', 'TOKEN', '-bn', 'wpt-export-branch'])
exporter = WebPlatformTestExporter(host, options, TestExporterTest.MockGit, TestExporterTest.MockBugzilla, MockWPTGitHub, TestExporterTest.MockWPTLinter)
exporter.do_export()
- self.assertEquals(exporter._git.calls, [
+ self.assertEqual(exporter._git.calls, [
'/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests',
'fetch',
'checkout master',
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -345,7 +345,7 @@
fs = self.import_downloaded_tests(['--no-fetch', '--import-all', '-d', 'w3c'], FAKE_FILES)
self.assertFalse(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/new-manual.html'))
- self.assertEquals(tests_options, fs.read_text_file('/mock-checkout/LayoutTests/tests-options.json'))
+ self.assertEqual(tests_options, fs.read_text_file('/mock-checkout/LayoutTests/tests-options.json'))
def test_webkit_test_runner_options(self):
FAKE_FILES = {
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -133,7 +133,7 @@
self.assertTrue('reference' in test_info.keys(), 'did not find a reference file')
self.assertTrue(test_info['reference'].startswith(test_path), 'reference path is not correct')
self.assertTrue('reference_support_info' in test_info.keys(), 'there should be reference_support_info for this test')
- self.assertEquals(len(test_info['reference_support_info']['files']), 4, 'there should be 4 support files in this reference')
+ self.assertEqual(len(test_info['reference_support_info']['files']), 4, 'there should be 4 support files in this reference')
self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')
def test_analyze_jstest(self):
Modified: trunk/Tools/Scripts/webkitpy/w3c/wpt_runner_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/w3c/wpt_runner_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/w3c/wpt_runner_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -127,9 +127,9 @@
self._expected_wpt_args = expected_wpt_args
def __call__(self, script_name, wpt_checkout, wpt_args):
- self._test_case.assertEquals(script_name, "wptrunner_unittest")
- self._test_case.assertEquals(wpt_checkout, self._expected_wpt_checkout)
- self._test_case.assertEquals(wpt_args, self._expected_wpt_args)
+ self._test_case.assertEqual(script_name, "wptrunner_unittest")
+ self._test_case.assertEqual(wpt_checkout, self._expected_wpt_checkout)
+ self._test_case.assertEqual(wpt_args, self._expected_wpt_args)
class TestInstance(object):
def __init__(self, options, spawn_wpt_func=None):
@@ -154,7 +154,7 @@
self.assertTrue(instance.runner.prepare_wpt_checkout())
expected_wpt_checkout = "/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests"
- self.assertEquals(instance.runner._options.wpt_checkout, expected_wpt_checkout)
+ self.assertEqual(instance.runner._options.wpt_checkout, expected_wpt_checkout)
self.assertTrue(instance.host.filesystem.isdir(expected_wpt_checkout))
def test_prepare_wpt_checkout_specified_path(self):
@@ -166,7 +166,7 @@
instance.host.filesystem.maybe_make_directory(specified_wpt_checkout)
self.assertTrue(instance.runner.prepare_wpt_checkout())
- self.assertEquals(instance.runner._options.wpt_checkout, specified_wpt_checkout)
+ self.assertEqual(instance.runner._options.wpt_checkout, specified_wpt_checkout)
def test_run(self):
# Tests the run() method. Files are mocked to the point that helper methods don't fail.
Modified: trunk/Tools/Scripts/webkitpy/xcode/device_type_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/xcode/device_type_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/xcode/device_type_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -31,70 +31,70 @@
def test_iphone_initialization(self):
type = DeviceType(hardware_family='iPhone')
- self.assertEquals('iPhone', type.hardware_family)
- self.assertEquals(None, type.hardware_type)
- self.assertEquals('iOS', type.software_variant)
- self.assertEquals(None, type.software_version)
+ self.assertEqual('iPhone', type.hardware_family)
+ self.assertEqual(None, type.hardware_type)
+ self.assertEqual('iOS', type.software_variant)
+ self.assertEqual(None, type.software_version)
self.assertEqual('iPhone running iOS', str(type))
type = DeviceType('iPhone', '6s', Version(11))
- self.assertEquals('iPhone', type.hardware_family)
- self.assertEquals('6s', type.hardware_type)
- self.assertEquals('iOS', type.software_variant)
- self.assertEquals(Version(11), type.software_version)
+ self.assertEqual('iPhone', type.hardware_family)
+ self.assertEqual('6s', type.hardware_type)
+ self.assertEqual('iOS', type.software_variant)
+ self.assertEqual(Version(11), type.software_version)
self.assertEqual('iPhone 6s running iOS 11', str(type))
def test_ipad_initialization(self):
type = DeviceType(hardware_family='iPad')
- self.assertEquals('iPad', type.hardware_family)
- self.assertEquals(None, type.hardware_type)
- self.assertEquals('iOS', type.software_variant)
- self.assertEquals(None, type.software_version)
+ self.assertEqual('iPad', type.hardware_family)
+ self.assertEqual(None, type.hardware_type)
+ self.assertEqual('iOS', type.software_variant)
+ self.assertEqual(None, type.software_version)
self.assertEqual('iPad running iOS', str(type))
type = DeviceType('iPad', 'Air 2', Version(11))
- self.assertEquals('iPad', type.hardware_family)
- self.assertEquals('Air 2', type.hardware_type)
- self.assertEquals('iOS', type.software_variant)
- self.assertEquals(Version(11), type.software_version)
+ self.assertEqual('iPad', type.hardware_family)
+ self.assertEqual('Air 2', type.hardware_type)
+ self.assertEqual('iOS', type.software_variant)
+ self.assertEqual(Version(11), type.software_version)
self.assertEqual('iPad Air 2 running iOS 11', str(type))
def test_generic_ios_device(self):
type = DeviceType(software_variant='iOS')
- self.assertEquals(None, type.hardware_family)
- self.assertEquals(None, type.hardware_type)
- self.assertEquals('iOS', type.software_variant)
- self.assertEquals(None, type.software_version)
+ self.assertEqual(None, type.hardware_family)
+ self.assertEqual(None, type.hardware_type)
+ self.assertEqual('iOS', type.software_variant)
+ self.assertEqual(None, type.software_version)
self.assertEqual('Device running iOS', str(type))
def test_watch_initialization(self):
type = DeviceType(hardware_family='Watch')
- self.assertEquals('Apple Watch', type.hardware_family)
- self.assertEquals(None, type.hardware_type)
- self.assertEquals('watchOS', type.software_variant)
- self.assertEquals(None, type.software_version)
+ self.assertEqual('Apple Watch', type.hardware_family)
+ self.assertEqual(None, type.hardware_type)
+ self.assertEqual('watchOS', type.software_variant)
+ self.assertEqual(None, type.software_version)
self.assertEqual('Apple Watch running watchOS', str(type))
type = DeviceType('Apple Watch', 'Series 2 - 42mm', Version(4))
- self.assertEquals('Apple Watch', type.hardware_family)
- self.assertEquals('Series 2 - 42mm', type.hardware_type)
- self.assertEquals('watchOS', type.software_variant)
- self.assertEquals(Version(4), type.software_version)
+ self.assertEqual('Apple Watch', type.hardware_family)
+ self.assertEqual('Series 2 - 42mm', type.hardware_type)
+ self.assertEqual('watchOS', type.software_variant)
+ self.assertEqual(Version(4), type.software_version)
self.assertEqual('Apple Watch Series 2 - 42mm running watchOS 4', str(type))
def test_tv_initialization(self):
type = DeviceType(hardware_family='TV')
- self.assertEquals('Apple TV', type.hardware_family)
- self.assertEquals(None, type.hardware_type)
- self.assertEquals('tvOS', type.software_variant)
- self.assertEquals(None, type.software_version)
+ self.assertEqual('Apple TV', type.hardware_family)
+ self.assertEqual(None, type.hardware_type)
+ self.assertEqual('tvOS', type.software_variant)
+ self.assertEqual(None, type.software_version)
self.assertEqual('Apple TV running tvOS', str(type))
type = DeviceType('Apple TV', '4K', Version(11))
- self.assertEquals('Apple TV', type.hardware_family)
- self.assertEquals('4K', type.hardware_type)
- self.assertEquals('tvOS', type.software_variant)
- self.assertEquals(Version(11), type.software_version)
+ self.assertEqual('Apple TV', type.hardware_family)
+ self.assertEqual('4K', type.hardware_type)
+ self.assertEqual('tvOS', type.software_variant)
+ self.assertEqual(Version(11), type.software_version)
self.assertEqual('Apple TV 4K running tvOS 11', str(type))
def test_from_string(self):
Modified: trunk/Tools/Scripts/webkitpy/xcode/sdk_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/xcode/sdk_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/xcode/sdk_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -72,48 +72,48 @@
def test_iphoneos(self):
preferred_sdk = sdk.SDK.get_preferred_sdk_for_platform("iphoneos", self.executive)
- self.assertEquals("iphoneos", preferred_sdk.platform)
- self.assertEquals("12.0", preferred_sdk.version)
+ self.assertEqual("iphoneos", preferred_sdk.platform)
+ self.assertEqual("12.0", preferred_sdk.version)
self.assertTrue(preferred_sdk.internal)
def test_iphonesim(self):
preferred_sdk = sdk.SDK.get_preferred_sdk_for_platform("iphonesimulator", self.executive)
- self.assertEquals("iphonesimulator", preferred_sdk.platform)
- self.assertEquals("12.0", preferred_sdk.version)
+ self.assertEqual("iphonesimulator", preferred_sdk.platform)
+ self.assertEqual("12.0", preferred_sdk.version)
self.assertFalse(preferred_sdk.internal)
def test_macos(self):
preferred_sdk = sdk.SDK.get_preferred_sdk_for_platform("macosx", self.executive)
- self.assertEquals("macosx", preferred_sdk.platform)
- self.assertEquals("10.14", preferred_sdk.version)
+ self.assertEqual("macosx", preferred_sdk.platform)
+ self.assertEqual("10.14", preferred_sdk.version)
self.assertTrue(preferred_sdk.internal)
def test_appletvos(self):
preferred_sdk = sdk.SDK.get_preferred_sdk_for_platform("appletvos", self.executive)
- self.assertEquals("appletvos", preferred_sdk.platform)
- self.assertEquals("12.0", preferred_sdk.version)
+ self.assertEqual("appletvos", preferred_sdk.platform)
+ self.assertEqual("12.0", preferred_sdk.version)
self.assertTrue(preferred_sdk.internal)
def test_appletvsim(self):
preferred_sdk = sdk.SDK.get_preferred_sdk_for_platform("appletvsimulator", self.executive)
- self.assertEquals("appletvsimulator", preferred_sdk.platform)
- self.assertEquals("12.0", preferred_sdk.version)
+ self.assertEqual("appletvsimulator", preferred_sdk.platform)
+ self.assertEqual("12.0", preferred_sdk.version)
self.assertFalse(preferred_sdk.internal)
def test_watchos(self):
preferred_sdk = sdk.SDK.get_preferred_sdk_for_platform("watchos", self.executive)
- self.assertEquals("watchos", preferred_sdk.platform)
- self.assertEquals("4.0", preferred_sdk.version)
+ self.assertEqual("watchos", preferred_sdk.platform)
+ self.assertEqual("4.0", preferred_sdk.version)
self.assertTrue(preferred_sdk.internal)
def test_watchsimulator(self):
preferred_sdk = sdk.SDK.get_preferred_sdk_for_platform("watchsimulator", self.executive)
- self.assertEquals("watchsimulator", preferred_sdk.platform)
- self.assertEquals("4.0", preferred_sdk.version)
+ self.assertEqual("watchsimulator", preferred_sdk.platform)
+ self.assertEqual("4.0", preferred_sdk.version)
self.assertFalse(preferred_sdk.internal)
def test_prodos(self):
preferred_sdk = sdk.SDK.get_preferred_sdk_for_platform("prodos", self.executive)
- self.assertEquals("prodos", preferred_sdk.platform)
- self.assertEquals(None, preferred_sdk.version)
- self.assertEquals(None, preferred_sdk.internal)
+ self.assertEqual("prodos", preferred_sdk.platform)
+ self.assertEqual(None, preferred_sdk.version)
+ self.assertEqual(None, preferred_sdk.internal)
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py (284774 => 284775)
--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py 2021-10-25 08:58:38 UTC (rev 284774)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py 2021-10-25 11:07:20 UTC (rev 284775)
@@ -568,33 +568,33 @@
SimulatedDeviceManager.available_devices(host)
# There should only be 1 iPhone X, iPhone 8 and iPhone SE
- self.assertEquals(1, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone X'), host)))
- self.assertEquals(1, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone 8'), host)))
+ self.assertEqual(1, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone X'), host)))
+ self.assertEqual(1, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone 8'), host)))
# There should be 2 5s and 6s
- self.assertEquals(2, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone 5s'), host)))
- self.assertEquals(2, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone 6s'), host)))
+ self.assertEqual(2, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone 5s'), host)))
+ self.assertEqual(2, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone 6s'), host)))
# 19 iPhones
- self.assertEquals(19, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone'), host)))
+ self.assertEqual(19, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPhone'), host)))
# 11 iPads
- self.assertEquals(11, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPad'), host)))
+ self.assertEqual(11, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('iPad'), host)))
# 18 Apple watches
- self.assertEquals(6, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('Apple Watch'), host)))
+ self.assertEqual(6, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('Apple Watch'), host)))
# 3 Apple TVs
- self.assertEquals(3, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('Apple TV'), host)))
+ self.assertEqual(3, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType.from_string('Apple TV'), host)))
# 18 devices running iOS 11.0
- self.assertEquals(18, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType(software_variant='iOS', software_version=Version(11, 0, 1)), host)))
+ self.assertEqual(18, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType(software_variant='iOS', software_version=Version(11, 0, 1)), host)))
# 11 iPhones running iOS 11.0
- self.assertEquals(11, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType(hardware_family='iPhone', software_version=Version(11, 0, 1)), host)))
+ self.assertEqual(11, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType(hardware_family='iPhone', software_version=Version(11, 0, 1)), host)))
# 1 device running iOS 12
- self.assertEquals(1, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType(software_variant='iOS', software_version=Version(12, 0, 0)), host)))
+ self.assertEqual(1, len(SimulatedDeviceManager.device_by_filter(lambda device: device.device_type == DeviceType(software_variant='iOS', software_version=Version(12, 0, 0)), host)))
def test_existing_simulator(self):
SimulatedDeviceTest.reset_simulated_device_manager()
@@ -603,10 +603,10 @@
SimulatedDeviceManager.initialize_devices(DeviceRequest(DeviceType.from_string('iPhone', Version(11))), host=host)
- self.assertEquals(1, len(SimulatedDeviceManager.INITIALIZED_DEVICES))
- self.assertEquals('34FB476C-6FA0-43C8-8945-1BD7A4EBF0DE', SimulatedDeviceManager.INITIALIZED_DEVICES[0].udid)
- self.assertEquals('15A8401', SimulatedDeviceManager.INITIALIZED_DEVICES[0].build_version)
- self.assertEquals(SimulatedDevice.DeviceState.BOOTED, SimulatedDeviceManager.INITIALIZED_DEVICES[0].platform_device.state())
+ self.assertEqual(1, len(SimulatedDeviceManager.INITIALIZED_DEVICES))
+ self.assertEqual('34FB476C-6FA0-43C8-8945-1BD7A4EBF0DE', SimulatedDeviceManager.INITIALIZED_DEVICES[0].udid)
+ self.assertEqual('15A8401', SimulatedDeviceManager.INITIALIZED_DEVICES[0].build_version)
+ self.assertEqual(SimulatedDevice.DeviceState.BOOTED, SimulatedDeviceManager.INITIALIZED_DEVICES[0].platform_device.state())
SimulatedDeviceManager.tear_down(host)
self.assertIsNone(SimulatedDeviceManager.INITIALIZED_DEVICES)
@@ -618,9 +618,9 @@
SimulatedDeviceManager.initialize_devices(DeviceRequest(DeviceType.from_string('iphone 5s', Version(11))), host=host)
- self.assertEquals(1, len(SimulatedDeviceManager.INITIALIZED_DEVICES))
- self.assertEquals('34FB476C-6FA0-43C8-8945-1BD7A4EBF0DE', SimulatedDeviceManager.INITIALIZED_DEVICES[0].udid)
- self.assertEquals(SimulatedDevice.DeviceState.BOOTED, SimulatedDeviceManager.INITIALIZED_DEVICES[0].platform_device.state())
+ self.assertEqual(1, len(SimulatedDeviceManager.INITIALIZED_DEVICES))
+ self.assertEqual('34FB476C-6FA0-43C8-8945-1BD7A4EBF0DE', SimulatedDeviceManager.INITIALIZED_DEVICES[0].udid)
+ self.assertEqual(SimulatedDevice.DeviceState.BOOTED, SimulatedDeviceManager.INITIALIZED_DEVICES[0].platform_device.state())
SimulatedDeviceManager.tear_down(host)
self.assertIsNone(SimulatedDeviceManager.INITIALIZED_DEVICES)
@@ -631,8 +631,8 @@
SimulatedDeviceManager.available_devices(host)
runtime = SimulatedDeviceManager.get_runtime_for_device_type(DeviceType.from_string('iphone 5s', Version(9, 2)))
- self.assertEquals(runtime.os_variant, 'iOS')
- self.assertEquals(runtime.version, Version(9, 3))
+ self.assertEqual(runtime.os_variant, 'iOS')
+ self.assertEqual(runtime.version, Version(9, 3))
def test_matching_up_failure(self):
SimulatedDeviceTest.reset_simulated_device_manager()
@@ -640,7 +640,7 @@
SimulatedDeviceManager.available_devices(host)
runtime = SimulatedDeviceManager.get_runtime_for_device_type(DeviceType.from_string('iphone 5s', Version(9, 4)))
- self.assertEquals(runtime, None)
+ self.assertEqual(runtime, None)
def test_no_state_files(self):
SimulatedDeviceTest.reset_simulated_device_manager()
@@ -649,4 +649,4 @@
devices = SimulatedDeviceManager.available_devices(host)
for device in devices:
- self.assertEquals(SimulatedDevice.DeviceState.SHUT_DOWN, device.state(force_update=True))
+ self.assertEqual(SimulatedDevice.DeviceState.SHUT_DOWN, device.state(force_update=True))
