From b95aba56b5abe22e61c01e166f2bca59e8515711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20L=C3=B6hning?= <robert.loehning@qt.io>
Date: Wed, 26 Jul 2023 18:26:26 +0200
Subject: [PATCH] SquishTests: Don't use lists of dicts

...when that doesn't have any advantages.

Change-Id: I0c58e30ae0b9e278e3336646332279f6243719d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../tst_default_settings/test.py              | 28 +++++++++----------
 .../system/suite_tools/tst_git_local/test.py  | 10 +++----
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index f7ece36e6de..57d7ae02cb1 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -359,24 +359,22 @@ def __lowerStrs__(iterable):
 def __checkCreatedSettings__(settingsFolder):
     waitForCleanShutdown()
     qtProj = os.path.join(settingsFolder, "QtProject")
-    folders = []
-    files = [{os.path.join(qtProj, "QtCreator.db"):0},
-             {os.path.join(qtProj, "QtCreator.ini"):30}]
-    folders.append(os.path.join(qtProj, "qtcreator"))
-    files.extend([{os.path.join(folders[0], "debuggers.xml"):0},
-                  {os.path.join(folders[0], "devices.xml"):0},
-                  {os.path.join(folders[0], "helpcollection.qhc"):0},
-                  {os.path.join(folders[0], "profiles.xml"):0},
-                  {os.path.join(folders[0], "qtversion.xml"):0},
-                  {os.path.join(folders[0], "toolchains.xml"):0}])
-    folders.extend([os.path.join(folders[0], "generic-highlighter"),
-                    os.path.join(folders[0], "macros")])
+    creatorFolder = os.path.join(qtProj, "qtcreator")
+    folders = [creatorFolder,
+               os.path.join(creatorFolder, "generic-highlighter"),
+               os.path.join(creatorFolder, "macros")]
+    files = {os.path.join(qtProj, "QtCreator.db"):0,
+             os.path.join(qtProj, "QtCreator.ini"):30,
+             os.path.join(creatorFolder, "debuggers.xml"):0,
+             os.path.join(creatorFolder, "devices.xml"):0,
+             os.path.join(creatorFolder, "helpcollection.qhc"):0,
+             os.path.join(creatorFolder, "profiles.xml"):0,
+             os.path.join(creatorFolder, "qtversion.xml"):0,
+             os.path.join(creatorFolder, "toolchains.xml"):0}
     for f in folders:
         test.verify(os.path.isdir(f),
                     "Verifying whether folder '%s' has been created." % os.path.basename(f))
-    for f in files:
-        fName = next(iter(f.keys()))
-        fMinSize = next(iter(f.values()))
+    for fName, fMinSize in files.items():
         text = "created non-empty"
         if fMinSize > 0:
             text = "modified"
diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py
index 450f3b58558..aefdc07d9a1 100644
--- a/tests/system/suite_tools/tst_git_local/test.py
+++ b/tests/system/suite_tools/tst_git_local/test.py
@@ -86,12 +86,12 @@ def __clickCommit__(count):
     show = str(description.plainText)
     id = "Nobody <nobody@nowhere\.com>"
     time = "\w{3} \w{3} \d{1,2} \d{2}:\d{2}:\d{2} \d{4}.* seconds ago\)"
-    expected = [{"commit %s" % commit:False},
-                {"Author: %s, %s" % (id, time): True},
-                {"Committer: %s, %s" % (id, time): True}]
+    expected = [["commit %s" % commit, False],
+                ["Author: %s, %s" % (id, time), True],
+                ["Committer: %s, %s" % (id, time), True]]
     for line, exp in zip(show.splitlines(), expected):
-        expLine = next(iter(exp.keys()))
-        isRegex = next(iter(exp.values()))
+        expLine = exp[0]
+        isRegex = exp[1]
         if isRegex:
             test.verify(re.match(expLine, line), "Verifying commit header line '%s'" % line)
         else: