Merge pull request #2288 from minrk/assertEquals

s/assertEquals/assertEqual (again): fix a few deprecated assertEquals that have snuck back in

IPython/frontend/html/notebook/tests/test_nbmanager.py

@@ -14,13 +14,13 b' class TestNotebookManager(TestCase):'
     def test_nb_dir(self):
         with TemporaryDirectory() as td:
             km = FileNotebookManager(notebook_dir=td)
-            self.assertEquals(km.notebook_dir, td)
+            self.assertEqual(km.notebook_dir, td)
 
     def test_create_nb_dir(self):
         with TemporaryDirectory() as td:
             nbdir = os.path.join(td, 'notebooks')
             km = FileNotebookManager(notebook_dir=nbdir)
-            self.assertEquals(km.notebook_dir, nbdir)
+            self.assertEqual(km.notebook_dir, nbdir)
 
     def test_missing_nb_dir(self):
         with TemporaryDirectory() as td:

IPython/parallel/tests/test_db.py

@@ -238,14 +238,14 b' class TestDictBackend(TaskDBTest, TestCase):'
         self.db.record_limit = 20
         self.db.cull_fraction = 0.2
         self.load_records(20)
-        self.assertEquals(len(self.db.get_history()), 20)
+        self.assertEqual(len(self.db.get_history()), 20)
         self.load_records(1)
         # 0.2 * 20 = 4, 21 - 4 = 17
-        self.assertEquals(len(self.db.get_history()), 17)
+        self.assertEqual(len(self.db.get_history()), 17)
         self.load_records(3)
-        self.assertEquals(len(self.db.get_history()), 20)
+        self.assertEqual(len(self.db.get_history()), 20)
         self.load_records(1)
-        self.assertEquals(len(self.db.get_history()), 17)
+        self.assertEqual(len(self.db.get_history()), 17)
         
         for i in range(100):
             self.load_records(1)
@@ -257,12 +257,12 b' class TestDictBackend(TaskDBTest, TestCase):'
         self.db.size_limit = 1000
         self.db.cull_fraction = 0.2
         self.load_records(100, buffer_size=10)
-        self.assertEquals(len(self.db.get_history()), 100)
+        self.assertEqual(len(self.db.get_history()), 100)
         self.load_records(1, buffer_size=0)
-        self.assertEquals(len(self.db.get_history()), 101)
+        self.assertEqual(len(self.db.get_history()), 101)
         self.load_records(1, buffer_size=1)
         # 0.2 * 100 = 20, 101 - 20 = 81
-        self.assertEquals(len(self.db.get_history()), 81)
+        self.assertEqual(len(self.db.get_history()), 81)
     
     def test_cull_size_drop(self):
         """dropping records updates tracked buffer size"""
@@ -270,15 +270,15 b' class TestDictBackend(TaskDBTest, TestCase):'
         self.db.size_limit = 1000
         self.db.cull_fraction = 0.2
         self.load_records(100, buffer_size=10)
-        self.assertEquals(len(self.db.get_history()), 100)
+        self.assertEqual(len(self.db.get_history()), 100)
         self.db.drop_record(self.db.get_history()[-1])
-        self.assertEquals(len(self.db.get_history()), 99)
+        self.assertEqual(len(self.db.get_history()), 99)
         self.load_records(1, buffer_size=5)
-        self.assertEquals(len(self.db.get_history()), 100)
+        self.assertEqual(len(self.db.get_history()), 100)
         self.load_records(1, buffer_size=5)
-        self.assertEquals(len(self.db.get_history()), 101)
+        self.assertEqual(len(self.db.get_history()), 101)
         self.load_records(1, buffer_size=1)
-        self.assertEquals(len(self.db.get_history()), 81)
+        self.assertEqual(len(self.db.get_history()), 81)
 
     def test_cull_size_update(self):
         """updating records updates tracked buffer size"""
@@ -286,12 +286,12 b' class TestDictBackend(TaskDBTest, TestCase):'
         self.db.size_limit = 1000
         self.db.cull_fraction = 0.2
         self.load_records(100, buffer_size=10)
-        self.assertEquals(len(self.db.get_history()), 100)
+        self.assertEqual(len(self.db.get_history()), 100)
         msg_id = self.db.get_history()[-1]
         self.db.update_record(msg_id, dict(result_buffers = [os.urandom(10)], buffers=[]))
-        self.assertEquals(len(self.db.get_history()), 100)
+        self.assertEqual(len(self.db.get_history()), 100)
         self.db.update_record(msg_id, dict(result_buffers = [os.urandom(11)], buffers=[]))
-        self.assertEquals(len(self.db.get_history()), 79)
+        self.assertEqual(len(self.db.get_history()), 79)
 
 class TestSQLiteBackend(TaskDBTest, TestCase):
 

IPython/parallel/tests/test_view.py

@@ -605,7 +605,7 b' class TestView(ClusterTestCase, ParametricTestCase):'
         view = self.client[-1]
         ar = view.apply_async(bar)
         r = ar.get(10)
-        self.assertEquals(r, 'foo')
+        self.assertEqual(r, 'foo')
     def test_data_pub_single(self):
         view = self.client[-1]
         ar = view.execute('\n'.join([