diff options
| author | Zachary Turner <zturner@google.com> | 2015-10-26 16:50:39 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2015-10-26 16:50:39 +0000 |
| commit | 210eb970de7fa9531f844e72074d1db662ff2b1e (patch) | |
| tree | 3c3e98a4f20962283c43150a1d8e6bc57bc30b27 /lldb/test/functionalities | |
| parent | 744cd5d8ed9c46dc05718c9cf598a1a4f29ef8ff (diff) | |
| download | bcm5719-llvm-210eb970de7fa9531f844e72074d1db662ff2b1e.tar.gz bcm5719-llvm-210eb970de7fa9531f844e72074d1db662ff2b1e.zip | |
Convert deprecated unittest method names.
Plural methods were long deprecated, and in Python 3 they are gone.
Convert to the actual supported method names.
llvm-svn: 251303
Diffstat (limited to 'lldb/test/functionalities')
4 files changed, 6 insertions, 6 deletions
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py index a82ff66798f..65f0f5c12ea 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py @@ -35,7 +35,7 @@ class LibcxxListDataFormatterTestCase(TestBase): process = target.LaunchSimple(None, None, self.get_process_working_directory()) lldbutil.skip_if_library_missing(self, target, lldbutil.PrintableRegex("libc\+\+")) self.assertTrue(process and process.IsValid(), PROCESS_IS_VALID) - self.assertEquals(len(lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint1)), 1) + self.assertEqual(len(lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint1)), 1) # verify our list is displayed correctly self.expect("frame variable *numbers_list", substrs=['[0] = 1', '[1] = 2', '[2] = 3', '[3] = 4', '[5] = 6']) @@ -43,7 +43,7 @@ class LibcxxListDataFormatterTestCase(TestBase): # Continue to breakpoint 2. process.Continue() self.assertTrue(process and process.IsValid(), PROCESS_IS_VALID) - self.assertEquals(len(lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint2)), 1) + self.assertEqual(len(lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint2)), 1) # The list is now inconsistent. However, we should be able to get the first three # elements at least (and most importantly, not crash). diff --git a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py index 7caa6cc6676..4cc630c4a67 100644 --- a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py +++ b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py @@ -43,7 +43,7 @@ class ChangedInferiorTestCase(TestBase): self.runCmd("run", RUN_SUCCEEDED) # We should have one crashing thread - self.assertEquals( + self.assertEqual( len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())), 1, STOPPED_DUE_TO_EXC_BAD_ACCESS) @@ -60,7 +60,7 @@ class ChangedInferiorTestCase(TestBase): self.runCmd("run", RUN_SUCCEEDED) self.runCmd("process status") - self.assertNotEquals( + self.assertNotEqual( len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())), 1, "Inferior changed, but lldb did not perform a reload") diff --git a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py index ad908f9dc4f..896221f00dd 100644 --- a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py +++ b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py @@ -65,7 +65,7 @@ class CrashingInferiorTestCase(TestBase): def check_stop_reason(self): # We should have one crashing thread - self.assertEquals( + self.assertEqual( len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())), 1, STOPPED_DUE_TO_EXC_BAD_ACCESS) diff --git a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py index 05af075a986..00ed361f21d 100644 --- a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py +++ b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py @@ -66,7 +66,7 @@ class CrashingRecursiveInferiorTestCase(TestBase): def check_stop_reason(self): # We should have one crashing thread - self.assertEquals( + self.assertEqual( len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())), 1, STOPPED_DUE_TO_EXC_BAD_ACCESS) |

