| 1 | diff --git a/test_fdusers.py b/test_fdusers.py
|
| 2 | index 0bbe29d..fb0b04a 100644
|
| 3 | |
| 4 | |
| 5 | @@ -194,12 +194,12 @@ class Testlibuserswithmocks(unittest.TestCase):
|
| 6 |
|
| 7 | def test_actual(self):
|
| 8 | """Test main() in human mode"""
|
| 9 | - self.assertEquals(self.f_u.main([]), None)
|
| 10 | + self.assertEqual(self.f_u.main([]), None)
|
| 11 |
|
| 12 | def test_actual2(self):
|
| 13 | """Test main() in machine mode"""
|
| 14 | - self.assertEquals(self.f_u.main(["-m"]), None)
|
| 15 | + self.assertEqual(self.f_u.main(["-m"]), None)
|
| 16 |
|
| 17 | def test_givenlist(self):
|
| 18 | """Test main() in default mode"""
|
| 19 | - self.assertEquals(self.f_u.main([]), None)
|
| 20 | + self.assertEqual(self.f_u.main([]), None)
|
| 21 | diff --git a/test_libusers.py b/test_libusers.py
|
| 22 | index f6fea84..cabf7e9 100644
|
| 23 | |
| 24 | |
| 25 | @@ -79,7 +79,7 @@ class Testlibusers(unittest.TestCase):
|
| 26 | "/i915 (deleted)")
|
| 27 | pseudofile = StringIO("\n".join(pseudofile))
|
| 28 | res = lib_users.get_deleted_libs(pseudofile)
|
| 29 | - self.assertEquals(res, EMPTYSET)
|
| 30 | + self.assertEqual(res, EMPTYSET)
|
| 31 |
|
| 32 | def test_libs_with_patterns(self):
|
| 33 | """Test detection of mappings that are libs but contain nonlib stuff"""
|
| 34 | @@ -105,7 +105,7 @@ class Testlibusers(unittest.TestCase):
|
| 35 | pseudofile = StringIO("\n".join(pseudofile))
|
| 36 | res = list(lib_users.get_deleted_libs(pseudofile))
|
| 37 | res.sort()
|
| 38 | - self.assertEquals(
|
| 39 | + self.assertEqual(
|
| 40 | res, ['/lib/SYSV00000000', '/lib/[aio]', '/lib/dev/shm/foo',
|
| 41 | '/lib/dev/zero', '/lib/drm', '/usr/lib/i915'])
|
| 42 |
|
| 43 | @@ -121,21 +121,21 @@ class Testlibusers(unittest.TestCase):
|
| 44 | '/v/t/p/sys-libs/glibc-2.15-r3/image/lib64/libdl-2.15.so',
|
| 45 | '/v/t/p/sys-libs/glibc-2.15-r3/image/lib64/ld-2.15.so'
|
| 46 | }
|
| 47 | - self.assertEquals(res, expected)
|
| 48 | + self.assertEqual(res, expected)
|
| 49 |
|
| 50 | def test_drm_mm_maps(self):
|
| 51 | """Test that deleted DRM maps yield no results"""
|
| 52 | testdata = open("testdata/drm-mm-maps").read()
|
| 53 | pseudofile = StringIO(testdata)
|
| 54 | res = lib_users.get_deleted_libs(pseudofile)
|
| 55 | - self.assertEquals(res, EMPTYSET)
|
| 56 | + self.assertEqual(res, EMPTYSET)
|
| 57 |
|
| 58 | def test_findlibs(self):
|
| 59 | """Test detection of "classic" lib name"""
|
| 60 | pseudofile = StringIO(
|
| 61 | "7f02a85f1000-7f02a85f2000 rw-p 0000c000 09:01 32642 "
|
| 62 | "/lib64/libfindme.so (deleted)")
|
| 63 | - self.assertEquals(
|
| 64 | + self.assertEqual(
|
| 65 | lib_users.get_deleted_libs(pseudofile),
|
| 66 | set(["/lib64/libfindme.so"]))
|
| 67 |
|
| 68 | @@ -144,28 +144,28 @@ class Testlibusers(unittest.TestCase):
|
| 69 | pseudofile = StringIO(
|
| 70 | "7f02a85fc000-7f02a87fb000 ---p 0000a000 09:01 32647 (deleted) "
|
| 71 | "/lib64/libdontfindme.so")
|
| 72 | - self.assertEquals(lib_users.get_deleted_libs(pseudofile), EMPTYSET)
|
| 73 | + self.assertEqual(lib_users.get_deleted_libs(pseudofile), EMPTYSET)
|
| 74 |
|
| 75 | def test_parennames(self):
|
| 76 | """Test detection of libraries with embedded special strings"""
|
| 77 | pseudofile = StringIO(
|
| 78 | "7f02a87fc000-7f02a87fd000 rw-p 0000a000 09:01 32647 "
|
| 79 | "/lib64/libdontfindmeeither_(deleted)i-2.11.2.so")
|
| 80 | - self.assertEquals(lib_users.get_deleted_libs(pseudofile), EMPTYSET)
|
| 81 | + self.assertEqual(lib_users.get_deleted_libs(pseudofile), EMPTYSET)
|
| 82 |
|
| 83 | def test_parenwcontent(self):
|
| 84 | """Test detection of superstrings of special strings"""
|
| 85 | pseudofile = StringIO(
|
| 86 | "7f02a87fc000-7f02a87fd000 rw-p 0000a000 09:01 32647 "
|
| 87 | "/lib64/libdontfindmeeither-2.11.2.so (notdeleted)")
|
| 88 | - self.assertEquals(lib_users.get_deleted_libs(pseudofile), EMPTYSET)
|
| 89 | + self.assertEqual(lib_users.get_deleted_libs(pseudofile), EMPTYSET)
|
| 90 |
|
| 91 | def test_parenwcontent2(self):
|
| 92 | """Test detection of substrings of special strings"""
|
| 93 | pseudofile = StringIO(
|
| 94 | "7f02a87fc000-7f02a87fd000 rw-p 0000a000 09:01 32647 "
|
| 95 | "/lib64/libdontfindmeeither-2.11.2.so (delete)")
|
| 96 | - self.assertEquals(lib_users.get_deleted_libs(pseudofile), EMPTYSET)
|
| 97 | + self.assertEqual(lib_users.get_deleted_libs(pseudofile), EMPTYSET)
|
| 98 |
|
| 99 |
|
| 100 | class Testlibuserswithmocks(unittest.TestCase):
|
| 101 | @@ -211,12 +211,12 @@ class Testlibuserswithmocks(unittest.TestCase):
|
| 102 |
|
| 103 | def test_actual(self):
|
| 104 | """Test main() in human mode"""
|
| 105 | - self.assertEquals(self.l_u.main([]), None)
|
| 106 | + self.assertEqual(self.l_u.main([]), None)
|
| 107 |
|
| 108 | def test_actual2(self):
|
| 109 | """Test main() in machine mode"""
|
| 110 | - self.assertEquals(self.l_u.main(["-m"]), None)
|
| 111 | + self.assertEqual(self.l_u.main(["-m"]), None)
|
| 112 |
|
| 113 | def test_givenlist(self):
|
| 114 | """Test main() in default mode"""
|
| 115 | - self.assertEquals(self.l_u.main([]), None)
|
| 116 | + self.assertEqual(self.l_u.main([]), None)
|