aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Löhning <robert.loehning@qt.io>2022-09-23 16:19:24 +0200
committerRobert Löhning <robert.loehning@qt.io>2022-09-28 12:13:34 +0000
commit37161065cf7460717d169713b90cc9140e1bae22 (patch)
tree41288363e9ae83c20cd8baf5f85f3d521ce716a0
parenta3f9d943a5831aa1092b4f0ec7b11321aa382f92 (diff)
Squish: Support VS2022
It has the same UI as VS2019 so I only needed to make some conditions less strict. Change-Id: I693a6e2fe10d5131f1b751f1880db2fbd14c6e57 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
-rw-r--r--Tests/system/suite_proofofconcept/tst_check_version/test.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tests/system/suite_proofofconcept/tst_check_version/test.py b/Tests/system/suite_proofofconcept/tst_check_version/test.py
index fbe5bb6e..89a85786 100644
--- a/Tests/system/suite_proofofconcept/tst_check_version/test.py
+++ b/Tests/system/suite_proofofconcept/tst_check_version/test.py
@@ -56,7 +56,7 @@ def startAppGetVersion():
except:
test.fatal("Cannot determine used VS version")
version = ""
- if version == "2019":
+ if version != "2017":
mouseClick(waitForObject(names.continueWithoutCode_Label))
return version
@@ -66,7 +66,7 @@ def checkVSVersion(version):
mouseClick(waitForObject(names.pART_Popup_About_Microsoft_Visual_Studio_MenuItem))
if version == "2017":
vsVersionText = waitForObjectExists(names.about_Microsoft_Visual_Studio_Microsoft_Visual_Studio_Community_2017_Label).text
- elif version == "2019":
+ else:
vsVersionText = waitForObjectExists(names.about_Microsoft_Visual_Studio_Edit).text
test.verify(version in vsVersionText,
"Is this VS %s as expected? Found:\n%s" % (version, vsVersionText))
@@ -77,7 +77,7 @@ def openExtensionManager(version):
if version == "2017":
mouseClick(waitForObject(names.tools_MenuItem))
mouseClick(waitForObject(names.pART_Popup_Extensions_and_Updates_MenuItem))
- elif version == "2019":
+ else:
mouseClick(waitForObject(names.extensions_MenuItem))
mouseClick(waitForObject(names.pART_Popup_Manage_Extensions_MenuItem))
@@ -94,7 +94,7 @@ def readVsToolsVersionFromSource():
def checkVsToolsVersion(version):
if version == "2017":
vsToolsLabel = waitForObject(names.extensionManager_UI_InstalledExtensionItem_The_Qt_VS_Tools_for_Visual_Studio_2017_Label)
- elif version == "2019":
+ else:
mouseClick(waitForObject({"type": "TreeItem", "id": "Installed"}))
vsToolsLabel = waitForObject(names.extensionManager_UI_InstalledExtensionItem_The_Qt_VS_Tools_for_Visual_Studio_2019_Label)
mouseClick(vsToolsLabel)