Skip to content

Commit 3420d9b

Browse files
hyongtao-codeyjhjstz
authored andcommitted
Clean up the use of the deprecated unittest.TestCase.assertEquals() (#15947)
Long log: Since `assertEquals()` has become a deprecated method in unittest, `assertEquals()` should be substituted by `assertEqual()`. Take an example as below: ``` import unittest class TestStringMethods(unittest.TestCase): def test_negative(self): firstValue = "abc" secondValue = "abc" self.assertEquals(firstValue, secondValue) if __name__ == '__main__': unittest.main() ``` run main.py, `DeprecationWarning` will happen. ``` python3 main.py main.py:7: DeprecationWarning: Please use assertEqual instead. self.assertEquals(firstValue, secondValue) . ---------------------------------------------------------------------- Ran 1 test in 0.000s OK ``` Signed-off-by: Yongtao Huang <[email protected]>
1 parent 8072a95 commit 3420d9b

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

gpMgmt/bin/gppylib/test/unit/test_unit_gpcheckperf.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@ def tearDown(self):
1717
def test_get_memory_on_darwin(self, mock_run, mock_get_platform):
1818
mock_run.return_value = [1, 'hw.physmem: 1234']
1919
actual_result = self.subject.getMemory()
20-
self.assertEquals(actual_result, None)
20+
self.assertEqual(actual_result, None)
2121

2222
mock_run.return_value = [0, 'hw.physmem: 0']
2323
actual_result = self.subject.getMemory()
24-
self.assertEquals(actual_result, None)
24+
self.assertEqual(actual_result, None)
2525

2626
mock_run.return_value = [0, 'hw.physmem: 1234']
2727
actual_result = self.subject.getMemory()
28-
self.assertEquals(actual_result, 1234)
28+
self.assertEqual(actual_result, 1234)
2929

3030
@patch('gpcheckperf.getPlatform', return_value='linux')
3131
@patch('gpcheckperf.run')
3232
def test_get_memory_on_linux(self, mock_run, mock_get_platform):
3333
mock_run.return_value = [1, 'MemTotal: 10 kB']
3434
actual_result = self.subject.getMemory()
35-
self.assertEquals(actual_result, None)
35+
self.assertEqual(actual_result, None)
3636

3737
mock_run.return_value = [0, 'MemTotal: 0 kB']
3838
actual_result = self.subject.getMemory()
39-
self.assertEquals(actual_result, None)
39+
self.assertEqual(actual_result, None)
4040

4141
mock_run.return_value = [0, 'MemTotal: 10 kB']
4242
actual_result = self.subject.getMemory()
43-
self.assertEquals(actual_result, 10240)
43+
self.assertEqual(actual_result, 10240)
4444

4545
@patch('gpcheckperf.getPlatform', return_value='abc')
4646
def test_get_memory_on_invalid_platform(self, mock_get_platform):
4747
actual_result = self.subject.getMemory()
48-
self.assertEquals(actual_result, None)
48+
self.assertEqual(actual_result, None)
4949

5050
@patch('gpcheckperf.getMemory', return_value=None)
5151
def test_parseCommandLine_when_get_memory_fails(self, mock_get_memory):

gpMgmt/bin/gppylib/test/unit/test_unit_mainUtils.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ def setUp(self):
1515

1616
def test_release_removes_lock(self):
1717
self.lock.acquire()
18-
self.assertEquals(True,os.path.exists(self.lockfile))
18+
self.assertEqual(True,os.path.exists(self.lockfile))
1919
self.lock.release()
20-
self.assertEquals(False, os.path.exists(self.lockfile))
20+
self.assertEqual(False, os.path.exists(self.lockfile))
2121

2222
def test_with_block_removes_lock(self):
2323
with self.lock:
24-
self.assertEquals(True,os.path.exists(self.lockfile))
25-
self.assertEquals(False, os.path.exists(self.lockfile))
24+
self.assertEqual(True,os.path.exists(self.lockfile))
25+
self.assertEqual(False, os.path.exists(self.lockfile))
2626

2727
def test_lock_owned_by_parent(self):
2828
with self.lock as l:
29-
self.assertEquals(l.read_pid(), self.ppid)
29+
self.assertEqual(l.read_pid(), self.ppid)
3030

3131

3232
def test_exceptionPIDLockHeld_if_same_pid(self):
@@ -38,7 +38,7 @@ def test_child_can_read_lock_owner(self):
3838
with self.lock as l:
3939
pid = os.fork()
4040
if pid == 0:
41-
self.assertEquals(l.read_pid(), self.ppid)
41+
self.assertEqual(l.read_pid(), self.ppid)
4242
os._exit(0)
4343
else:
4444
os.wait()
@@ -90,7 +90,7 @@ def test_childPID_can_not_remove_parent_lock(self):
9090
# we expect the the acquire to fail
9191
except:
9292
pass
93-
self.assertEquals(True, os.path.exists(self.lockfile))
93+
self.assertEqual(True, os.path.exists(self.lockfile))
9494
os._exit(0)
9595
else:
9696
os.wait()

0 commit comments

Comments
 (0)