summaryrefslogtreecommitdiff
path: root/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/Scripts/webkitpy/common/system/filesystem_unittest.py')
-rw-r--r--Tools/Scripts/webkitpy/common/system/filesystem_unittest.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py b/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py
index e6d1e428f..d656b2580 100644
--- a/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py
+++ b/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py
@@ -60,19 +60,19 @@ class GenericFileSystemTests(object):
def test_glob__trailing_asterisk(self):
self.fs.chdir(self.generic_test_dir)
- self.assertEquals(set(self.fs.glob('fo*')), set(['foo.txt', 'foobar', 'foodir']))
+ self.assertEqual(set(self.fs.glob('fo*')), set(['foo.txt', 'foobar', 'foodir']))
def test_glob__leading_asterisk(self):
self.fs.chdir(self.generic_test_dir)
- self.assertEquals(set(self.fs.glob('*xt')), set(['foo.txt']))
+ self.assertEqual(set(self.fs.glob('*xt')), set(['foo.txt']))
def test_glob__middle_asterisk(self):
self.fs.chdir(self.generic_test_dir)
- self.assertEquals(set(self.fs.glob('f*r')), set(['foobar', 'foodir']))
+ self.assertEqual(set(self.fs.glob('f*r')), set(['foobar', 'foodir']))
def test_glob__period_is_escaped(self):
self.fs.chdir(self.generic_test_dir)
- self.assertEquals(set(self.fs.glob('foo.*')), set(['foo.txt']))
+ self.assertEqual(set(self.fs.glob('foo.*')), set(['foo.txt']))
class RealFileSystemTest(unittest.TestCase, GenericFileSystemTests):
def setUp(self):
@@ -94,7 +94,7 @@ class RealFileSystemTest(unittest.TestCase, GenericFileSystemTests):
if sys.platform == 'win32':
newdir = 'c:\\'
fs.chdir(newdir)
- self.assertEquals(fs.getcwd(), newdir)
+ self.assertEqual(fs.getcwd(), newdir)
fs.chdir(cwd)
def test_chdir__notexists(self):
@@ -246,13 +246,13 @@ class RealFileSystemTest(unittest.TestCase, GenericFileSystemTests):
fs = FileSystem()
self.assertTrue(fs.remove('filename', remove_with_exception))
- self.assertEquals(-1, RealFileSystemTest._remove_failures)
+ self.assertEqual(-1, RealFileSystemTest._remove_failures)
def test_sep(self):
fs = FileSystem()
- self.assertEquals(fs.sep, os.sep)
- self.assertEquals(fs.join("foo", "bar"),
+ self.assertEqual(fs.sep, os.sep)
+ self.assertEqual(fs.join("foo", "bar"),
os.path.join("foo", "bar"))