fixup! Add test for PostgreSQL transaction tracking

Author: living180

tests/panels/test_sql.py

@@ -528,13 +528,11 @@ def test_aliases(self):
         query = self.panel._queries[-1]
         self.assertEqual(query[0], "replica")
 
-    @unittest.skipUnless(
-        connection.vendor == "postgresql", "Test valid only on PostgreSQL"
-    )
     def test_transaction_status(self):
         """
-        Test case for tracking the transaction status is properly associated
-        with queries.
+        Test case for tracking the transaction status is properly associated with
+        queries on PostgreSQL, and that transactions aren't broken on other database
+        engines.
         """
         self.assertEqual(len(self.panel._queries), 0)
 
@@ -554,49 +552,68 @@ def test_transaction_status(self):
         response = self.panel.process_request(self.request)
         self.panel.generate_stats(self.request, response)
 
-        self.assertEqual(len(self.panel._queries), 6)
-
-        query = self.panel._queries[0]
-        self.assertEqual(query[0], "default")
-        self.assertIsNotNone(query[1]["trans_id"])
-        self.assertTrue(query[1].get("starts_trans", False))
-        self.assertTrue(query[1].get("in_trans", False))
-        self.assertFalse(query[1].get("ends_trans", False))
-
-        query = self.panel._queries[-1]
-        self.assertEqual(query[0], "replica")
-        self.assertIsNone(query[1]["trans_id"])
-        self.assertFalse(query[1].get("starts_trans", False))
-        self.assertFalse(query[1].get("in_trans", False))
-        self.assertFalse(query[1].get("ends_trans", False))
-        self.assertFalse(query[1].get("ends_trans", False))
-
-        query = self.panel._queries[2]
-        self.assertEqual(query[0], "default")
-        self.assertEqual(query[1]["trans_id"], self.panel._queries[0][1]["trans_id"])
-        self.assertFalse(query[1].get("starts_trans", False))
-        self.assertTrue(query[1].get("in_trans", False))
-        self.assertTrue(query[1].get("ends_trans", False))
-
-        query = self.panel._queries[3]
-        self.assertEqual(query[0], "replica")
-        self.assertNotEqual(query[1]["trans_id"], self.panel._queries[0][1]["trans_id"])
-        self.assertTrue(query[1].get("starts_trans", False))
-        self.assertTrue(query[1].get("in_trans", False))
-        self.assertTrue(query[1].get("ends_trans", False))
-
-        query = self.panel._queries[4]
-        self.assertEqual(query[0], "default")
-        self.assertNotEqual(query[1]["trans_id"], self.panel._queries[0][1]["trans_id"])
-        self.assertNotEqual(query[1]["trans_id"], self.panel._queries[3][1]["trans_id"])
-        self.assertTrue(query[1].get("starts_trans", False))
-        self.assertTrue(query[1].get("in_trans", False))
-        self.assertTrue(query[1].get("ends_trans", False))
-
-        query = self.panel._queries[5]
-        self.assertEqual(query[0], "replica")
-        self.assertIsNone(query[1]["trans_id"])
-        self.assertFalse(query[1].get("starts_trans", False))
-        self.assertFalse(query[1].get("in_trans", False))
-        self.assertFalse(query[1].get("ends_trans", False))
-        self.assertFalse(query[1].get("ends_trans", False))
+        if connection.vendor == "postgresql":
+            # Connection tracking is currently only implemented for PostgreSQL.
+            self.assertEqual(len(self.panel._queries), 6)
+
+            query = self.panel._queries[0]
+            self.assertEqual(query[0], "default")
+            self.assertIsNotNone(query[1]["trans_id"])
+            self.assertTrue(query[1]["starts_trans"])
+            self.assertTrue(query[1]["in_trans"])
+            self.assertFalse("end_trans" in query[1])
+
+            query = self.panel._queries[-1]
+            self.assertEqual(query[0], "replica")
+            self.assertIsNone(query[1]["trans_id"])
+            self.assertFalse("starts_trans" in query[1])
+            self.assertFalse("in_trans" in query[1])
+            self.assertFalse("end_trans" in query[1])
+
+            query = self.panel._queries[2]
+            self.assertEqual(query[0], "default")
+            self.assertIsNotNone(query[1]["trans_id"])
+            self.assertEqual(
+                query[1]["trans_id"], self.panel._queries[0][1]["trans_id"]
+            )
+            self.assertFalse("starts_trans" in query[1])
+            self.assertTrue(query[1]["in_trans"])
+            self.assertTrue(query[1]["ends_trans"])
+
+            query = self.panel._queries[3]
+            self.assertEqual(query[0], "replica")
+            self.assertIsNotNone(query[1]["trans_id"])
+            self.assertNotEqual(
+                query[1]["trans_id"], self.panel._queries[0][1]["trans_id"]
+            )
+            self.assertTrue(query[1]["starts_trans"])
+            self.assertTrue(query[1]["in_trans"])
+            self.assertTrue(query[1]["ends_trans"])
+
+            query = self.panel._queries[4]
+            self.assertEqual(query[0], "default")
+            self.assertIsNotNone(query[1]["trans_id"])
+            self.assertNotEqual(
+                query[1]["trans_id"], self.panel._queries[0][1]["trans_id"]
+            )
+            self.assertNotEqual(
+                query[1]["trans_id"], self.panel._queries[3][1]["trans_id"]
+            )
+            self.assertTrue(query[1]["starts_trans"])
+            self.assertTrue(query[1]["in_trans"])
+            self.assertTrue(query[1]["ends_trans"])
+
+            query = self.panel._queries[5]
+            self.assertEqual(query[0], "replica")
+            self.assertIsNone(query[1]["trans_id"])
+            self.assertFalse("starts_trans" in query[1])
+            self.assertFalse("in_trans" in query[1])
+            self.assertFalse("end_trans" in query[1])
+        else:
+            # Ensure that nothing was recorded for other database engines.
+            self.assertTrue(self.panel._queries)
+            for query in self.panel._queries:
+                self.assertFalse("trans_id" in query[1])
+                self.assertFalse("starts_trans" in query[1])
+                self.assertFalse("in_trans" in query[1])
+                self.assertFalse("end_trans" in query[1])