wip

1 files changed, 16 insertions, 16 deletions

diff --git a/test/test-suite b/test/test-suite
index 42c7a4c..7a36b24 100755
--- a/test/test-suite
+++ b/test/test-suite
@@ -252,7 +252,7 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " "select * from %s" -H' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(o), 0)
         self.assertEqual(len(e), 3)
 
@@ -438,7 +438,7 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select * from %s" -A -H' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(o), 0)
         self.assertEqual(len(e), 3)
         self.assertTrue(
@@ -453,7 +453,7 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c1 from %s" -A -H' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(o),4)
         self.assertEqual(len(e),2)
         self.assertEqual(o[0], six.b('Table for file: %s' % tmpfile.name))
@@ -496,7 +496,7 @@ class BasicTests(AbstractQTestCase):
 
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(o), 0)
         self.assertEqual(len(e), 2)
         self.assertTrue(six.b('no such column: c3') in e[0])
@@ -542,7 +542,7 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d , "select c1 from %s" -H' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(o), 0)
         self.assertEqual(len(e), 1)
 
@@ -956,7 +956,7 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " -m strict -D , -w none "select * from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode,0)
+        self.assertNotEqual(retcode,0)
         self.assertEqual(len(e),1)
         self.assertEqual(len(o),0)
 
@@ -1000,7 +1000,7 @@ class BasicTests(AbstractQTestCase):
         cmd = '../bin/q -d " " -D , -w unknown_wrapping_mode "select * from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode,0)
+        self.assertNotEqual(retcode,0)
         self.assertEqual(len(e),1)
         self.assertEqual(len(o),0)
 
@@ -1319,7 +1319,7 @@ class BasicTests(AbstractQTestCase):
 
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode,0)
+        self.assertNotEqual(retcode,0)
         self.assertEqual(len(o),0)
         self.assertEqual(len(e),1)
 
@@ -1429,7 +1429,7 @@ class ParsingModeTests(AbstractQTestCase):
         cmd = '../bin/q -m strict "select count(*) from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(o), 0)
         self.assertEqual(len(e), 1)
 
@@ -1442,7 +1442,7 @@ class ParsingModeTests(AbstractQTestCase):
         cmd = '../bin/q -d , -m strict -c 4 "select count(*) from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(o), 0)
         self.assertEqual(len(e), 1)
 
@@ -1456,7 +1456,7 @@ class ParsingModeTests(AbstractQTestCase):
         cmd = '../bin/q -d , -m strict -c 2 "select count(*) from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(o), 0)
         self.assertEqual(len(e), 1)
 
@@ -1488,7 +1488,7 @@ class ParsingModeTests(AbstractQTestCase):
         cmd = '../bin/q -d , -m strict "select count(*) from %s" -H -A' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(o), 0)
         self.assertEqual(len(e), 1)
 
@@ -1701,7 +1701,7 @@ class ParsingModeTests(AbstractQTestCase):
         cmd = '../bin/q -m fluffy "select * from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode,0)
+        self.assertNotEqual(retcode,0)
         self.assertEqual(len(o),0)
         self.assertEqual(len(e),1)
         self.assertTrue(e[0].startswith(six.b("Deprecated fluffy mode")))
@@ -1718,7 +1718,7 @@ class ParsingModeTests(AbstractQTestCase):
         cmd = '../bin/q -m strict "select * from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode,0)
+        self.assertNotEqual(retcode,0)
         self.assertEqual(len(o),0)
         self.assertEqual(len(e),1)
         self.assertTrue(e[0].startswith(six.b("Strict mode - Expected 4 columns instead of 3 columns")))
@@ -1735,7 +1735,7 @@ class ParsingModeTests(AbstractQTestCase):
         cmd = '../bin/q -m strict "select * from %s"' % tmpfile.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode,0)
+        self.assertNotEqual(retcode,0)
         self.assertEqual(len(o),0)
         self.assertEqual(len(e),1)
         self.assertTrue(e[0].startswith(six.b("Strict mode - Expected 4 columns instead of 5 columns")))
@@ -1782,7 +1782,7 @@ class FormattingTests(AbstractQTestCase):
         cmd = '../bin/q -d , -H "select * from %s"' % tmp_data_file.name
         retcode, o, e = run_command(cmd)
 
-        self.assertNotEquals(retcode, 0)
+        self.assertNotEqual(retcode, 0)
         self.assertEqual(len(e), 1)
         self.assertEqual(len(o), 0)