address comments

Author: ZequanWu

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/deque/TestDataFormatterLibcxxDeque.py

@@ -10,36 +10,26 @@
 
 class LibcxxDequeDataFormatterTestCase(TestBase):
     def check_numbers(self, var_name, show_ptr=False):
+        patterns = []
+        substrs = [
+            "[0] = 1",
+            "[1] = 12",
+            "[2] = 123",
+            "[3] = 1234",
+            "[4] = 12345",
+            "[5] = 123456",
+            "[6] = 1234567",
+            "}",
+        ]
         if show_ptr:
-            self.expect(
-                "frame variable " + var_name,
-                patterns=[var_name + " = 0x.* size=7"],
-                substrs=[
-                    "[0] = 1",
-                    "[1] = 12",
-                    "[2] = 123",
-                    "[3] = 1234",
-                    "[4] = 12345",
-                    "[5] = 123456",
-                    "[6] = 1234567",
-                    "}",
-                ],
-            )
+            patterns = [var_name + " = 0x.* size=7"]
         else:
-            self.expect(
-                "frame variable " + var_name,
-                substrs=[
-                    var_name + " = size=7",
-                    "[0] = 1",
-                    "[1] = 12",
-                    "[2] = 123",
-                    "[3] = 1234",
-                    "[4] = 12345",
-                    "[5] = 123456",
-                    "[6] = 1234567",
-                    "}",
-                ],
-            )
+            substrs.insert(0, var_name + " = size=7")
+        self.expect(
+            "frame variable " + var_name,
+            patterns=patterns,
+            substrs=substrs,
+        )
         self.expect_expr(
             var_name,
             result_summary="size=7",

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py

@@ -11,36 +11,27 @@
 
 class LibcxxVectorDataFormatterTestCase(TestBase):
     def check_numbers(self, var_name, show_ptr=False):
+        patterns = []
+        substrs = [
+            "[0] = 1",
+            "[1] = 12",
+            "[2] = 123",
+            "[3] = 1234",
+            "[4] = 12345",
+            "[5] = 123456",
+            "[6] = 1234567",
+            "}",
+        ]
         if show_ptr:
-            self.expect(
-                "frame variable " + var_name,
-                patterns=[var_name + " = 0x.* size=7"],
-                substrs=[
-                    "[0] = 1",
-                    "[1] = 12",
-                    "[2] = 123",
-                    "[3] = 1234",
-                    "[4] = 12345",
-                    "[5] = 123456",
-                    "[6] = 1234567",
-                    "}",
-                ],
-            )
+            patterns = [var_name + " = 0x.* size=7"]
         else:
-            self.expect(
-                "frame variable " + var_name,
-                substrs=[
-                    var_name + " = size=7",
-                    "[0] = 1",
-                    "[1] = 12",
-                    "[2] = 123",
-                    "[3] = 1234",
-                    "[4] = 12345",
-                    "[5] = 123456",
-                    "[6] = 1234567",
-                    "}",
-                ],
-            )
+            substrs.insert(0, var_name + " = size=7")
+
+        self.expect(
+            "frame variable " + var_name,
+            patterns=patterns,
+            substrs=substrs,
+        )
         self.expect_expr(
             var_name,
             result_summary="size=7",