Try running pyupgrade on the code

command run is "pyupgrade --py37-plus --keep-runtime-typing --keep-percent-format <files...>"
pyupgrade will change assert_ to assertTrue. That was reverted since assertTrue does not
exists in sqlalchemy fixtures

Change-Id: Ie1ed2675c7b11d893d78e028aad0d1576baebb55

4 files changed, 74 insertions, 78 deletions

diff --git a/test/base/test_dependency.py b/test/base/test_dependency.py
index 9250c3334..ac95d7ab3 100644
--- a/test/base/test_dependency.py
+++ b/test/base/test_dependency.py
@@ -122,19 +122,17 @@ class DependencySortTest(fixtures.TestBase):
             list(topological.sort(tuples, allitems))
             assert False
         except exc.CircularDependencyError as err:
-            eq_(err.cycles, set(["node1", "node3", "node2", "node5", "node4"]))
+            eq_(err.cycles, {"node1", "node3", "node2", "node5", "node4"})
             eq_(
                 err.edges,
-                set(
-                    [
-                        ("node3", "node1"),
-                        ("node4", "node1"),
-                        ("node2", "node3"),
-                        ("node1", "node2"),
-                        ("node4", "node5"),
-                        ("node5", "node4"),
-                    ]
-                ),
+                {
+                    ("node3", "node1"),
+                    ("node4", "node1"),
+                    ("node2", "node3"),
+                    ("node1", "node2"),
+                    ("node4", "node5"),
+                    ("node5", "node4"),
+                },
             )
 
     def test_raise_on_cycle_two(self):
@@ -159,18 +157,16 @@ class DependencySortTest(fixtures.TestBase):
             list(topological.sort(tuples, allitems))
             assert False
         except exc.CircularDependencyError as err:
-            eq_(err.cycles, set(["node1", "node3", "node2"]))
+            eq_(err.cycles, {"node1", "node3", "node2"})
             eq_(
                 err.edges,
-                set(
-                    [
-                        ("node3", "node1"),
-                        ("node2", "node3"),
-                        ("node3", "node2"),
-                        ("node1", "node2"),
-                        ("node2", "node4"),
-                    ]
-                ),
+                {
+                    ("node3", "node1"),
+                    ("node2", "node3"),
+                    ("node3", "node2"),
+                    ("node1", "node2"),
+                    ("node2", "node4"),
+                },
             )
 
     def test_raise_on_cycle_three(self):
@@ -225,7 +221,7 @@ class DependencySortTest(fixtures.TestBase):
         ]
         eq_(
             topological.find_cycles(tuples, self._nodes_from_tuples(tuples)),
-            set([node1, node2, node3]),
+            {node1, node2, node3},
         )
 
     def test_find_multiple_cycles_one(self):
@@ -252,23 +248,29 @@ class DependencySortTest(fixtures.TestBase):
             (node3, node1),
             (node3, node2),
         ]
-        allnodes = set(
-            [node1, node2, node3, node4, node5, node6, node7, node8, node9]
-        )
+        allnodes = {
+            node1,
+            node2,
+            node3,
+            node4,
+            node5,
+            node6,
+            node7,
+            node8,
+            node9,
+        }
         eq_(
             topological.find_cycles(tuples, allnodes),
-            set(
-                [
-                    "node8",
-                    "node1",
-                    "node2",
-                    "node5",
-                    "node4",
-                    "node7",
-                    "node6",
-                    "node9",
-                ]
-            ),
+            {
+                "node8",
+                "node1",
+                "node2",
+                "node5",
+                "node4",
+                "node7",
+                "node6",
+                "node9",
+            },
         )
 
     def test_find_multiple_cycles_two(self):
@@ -287,11 +289,11 @@ class DependencySortTest(fixtures.TestBase):
             (node2, node4),
             (node4, node1),
         ]
-        allnodes = set([node1, node2, node3, node4, node5, node6])
+        allnodes = {node1, node2, node3, node4, node5, node6}
         # node6 only became present here once [ticket:2282] was addressed.
         eq_(
             topological.find_cycles(tuples, allnodes),
-            set(["node1", "node2", "node4", "node6"]),
+            {"node1", "node2", "node4", "node6"},
         )
 
     def test_find_multiple_cycles_three(self):
@@ -312,7 +314,7 @@ class DependencySortTest(fixtures.TestBase):
             (node5, node6),
             (node6, node2),
         ]
-        allnodes = set([node1, node2, node3, node4, node5, node6])
+        allnodes = {node1, node2, node3, node4, node5, node6}
         eq_(topological.find_cycles(tuples, allnodes), allnodes)
 
     def test_find_multiple_cycles_four(self):
@@ -350,22 +352,20 @@ class DependencySortTest(fixtures.TestBase):
         allnodes = ["node%d" % i for i in range(1, 21)]
         eq_(
             topological.find_cycles(tuples, allnodes),
-            set(
-                [
-                    "node11",
-                    "node10",
-                    "node13",
-                    "node15",
-                    "node14",
-                    "node17",
-                    "node19",
-                    "node20",
-                    "node8",
-                    "node1",
-                    "node3",
-                    "node2",
-                    "node4",
-                    "node6",
-                ]
-            ),
+            {
+                "node11",
+                "node10",
+                "node13",
+                "node15",
+                "node14",
+                "node17",
+                "node19",
+                "node20",
+                "node8",
+                "node1",
+                "node3",
+                "node2",
+                "node4",
+                "node6",
+            },
         )
diff --git a/test/base/test_except.py b/test/base/test_except.py
index 77f5c731a..a458afb97 100644
--- a/test/base/test_except.py
+++ b/test/base/test_except.py
@@ -1,5 +1,3 @@
-#! coding:utf-8
-
 """Tests exceptions and DB-API exception wrapping."""
 
 from itertools import product
diff --git a/test/base/test_utils.py b/test/base/test_utils.py
index 349ee8c05..b979d43bc 100644
--- a/test/base/test_utils.py
+++ b/test/base/test_utils.py
@@ -1,5 +1,3 @@
-#! coding: utf-8
-
 import copy
 import inspect
 from pathlib import Path
@@ -543,7 +541,7 @@ class ToListTest(fixtures.TestBase):
         eq_(util.to_list("xyz"), ["xyz"])
 
     def test_from_set(self):
-        spec = util.to_list(set([1, 2, 3]))
+        spec = util.to_list({1, 2, 3})
         assert isinstance(spec, list)
         eq_(sorted(spec), [1, 2, 3])
 
@@ -567,7 +565,7 @@ class ToListTest(fixtures.TestBase):
 
 class ColumnCollectionCommon(testing.AssertsCompiledSQL):
     def _assert_collection_integrity(self, coll):
-        eq_(coll._colset, set(c for k, c, _ in coll._collection))
+        eq_(coll._colset, {c for k, c, _ in coll._collection})
         d = {}
         for k, col, _ in coll._collection:
             d.setdefault(k, (k, col))
@@ -1964,7 +1962,7 @@ class IdentitySetTest(fixtures.TestBase):
             assert True
 
         try:
-            s = set([o1, o2])
+            s = {o1, o2}
             s |= ids
             assert False
         except TypeError:
@@ -2019,7 +2017,7 @@ class OrderedIdentitySetTest(fixtures.TestBase):
 
 
 class DictlikeIteritemsTest(fixtures.TestBase):
-    baseline = set([("a", 1), ("b", 2), ("c", 3)])
+    baseline = {("a", 1), ("b", 2), ("c", 3)}
 
     def _ok(self, instance):
         iterator = util.dictlike_iteritems(instance)
@@ -2966,7 +2964,7 @@ class GenericReprTest(fixtures.TestBase):
                 self.e = e
                 self.f = f
                 self.g = g
-                super(Bar, self).__init__(**kw)
+                super().__init__(**kw)
 
         eq_(
             util.generic_repr(
@@ -2989,7 +2987,7 @@ class GenericReprTest(fixtures.TestBase):
         class Bar(Foo):
             def __init__(self, b=3, c=4, **kw):
                 self.c = c
-                super(Bar, self).__init__(b=b, **kw)
+                super().__init__(b=b, **kw)
 
         eq_(
             util.generic_repr(Bar(a="a", b="b", c="c"), to_inspect=[Bar, Foo]),
@@ -3125,7 +3123,7 @@ class AsInterfaceTest(fixtures.TestBase):
 
         def assertAdapted(obj, *methods):
             assert isinstance(obj, type)
-            found = set([m for m in dir(obj) if not m.startswith("_")])
+            found = {m for m in dir(obj) if not m.startswith("_")}
             for method in methods:
                 assert method in found
                 found.remove(method)
@@ -3163,7 +3161,7 @@ class AsInterfaceTest(fixtures.TestBase):
 
 class TestClassHierarchy(fixtures.TestBase):
     def test_object(self):
-        eq_(set(util.class_hierarchy(object)), set((object,)))
+        eq_(set(util.class_hierarchy(object)), {object})
 
     def test_single(self):
         class A:
@@ -3172,14 +3170,14 @@ class TestClassHierarchy(fixtures.TestBase):
         class B:
             pass
 
-        eq_(set(util.class_hierarchy(A)), set((A, object)))
-        eq_(set(util.class_hierarchy(B)), set((B, object)))
+        eq_(set(util.class_hierarchy(A)), {A, object})
+        eq_(set(util.class_hierarchy(B)), {B, object})
 
         class C(A, B):
             pass
 
-        eq_(set(util.class_hierarchy(A)), set((A, B, C, object)))
-        eq_(set(util.class_hierarchy(B)), set((A, B, C, object)))
+        eq_(set(util.class_hierarchy(A)), {A, B, C, object})
+        eq_(set(util.class_hierarchy(B)), {A, B, C, object})
 
 
 class TestClassProperty(fixtures.TestBase):
@@ -3190,7 +3188,7 @@ class TestClassProperty(fixtures.TestBase):
         class B(A):
             @classproperty
             def something(cls):
-                d = dict(super(B, cls).something)
+                d = dict(super().something)
                 d.update({"bazz": 2})
                 return d
 
@@ -3319,7 +3317,7 @@ class BackslashReplaceTest(fixtures.TestBase):
     def test_utf8_to_utf8(self):
         eq_(
             compat.decode_backslashreplace(
-                "some message méil".encode("utf-8"), "utf-8"
+                "some message méil".encode(), "utf-8"
             ),
             "some message méil",
         )
diff --git a/test/base/test_warnings.py b/test/base/test_warnings.py
index e951fcafc..ee286a7bc 100644
--- a/test/base/test_warnings.py
+++ b/test/base/test_warnings.py
@@ -42,7 +42,7 @@ class WarnDeprecatedLimitedTest(fixtures.TestBase):
 class ClsWarningTest(fixtures.TestBase):
     @testing.fixture
     def dep_cls_fixture(self):
-        class Connectable(object):
+        class Connectable:
             """a docstring"""
 
             some_member = "foo"
@@ -63,7 +63,7 @@ class ClsWarningTest(fixtures.TestBase):
 
         import inspect
 
-        class PlainClass(object):
+        class PlainClass:
             some_member = "bar"
 
         pc_keys = dict(inspect.getmembers(PlainClass()))