Fix tests with AT-SPI2 >= 2.53

Role name for push buttons changed from "push button" to "button" for
uniformizing APIs, but that means the names Dogtail use have to match,
as it's not using the role IDs but names.

Fix this by trying to ask AT-SPI2 for the name, and falling back on the
historical name in the odd case it'd fail.

1 files changed, 5 insertions, 5 deletions

diff --git a/test/testFileMenu.py b/test/testFileMenu.py
index 5c1c5a9a..81723c8d 100755
--- a/test/testFileMenu.py
+++ b/test/testFileMenu.py
@@ -2,7 +2,7 @@
 
 # Test that the File menu and menu items work correctly.
 
-from testCommon import run_app, bail
+from testCommon import run_app, bail, pushButton
 
 from dogtail.procedural import *
 
@@ -12,20 +12,20 @@ try:
     # Open a file
     click('File', roleName='menu')
     click('Open…', roleName='menu item')
-    click('Cancel', roleName='push button')
+    click('Cancel', roleName=pushButton)
 
     # Save As
     focus.frame('test-links.pdf')
     click('File', roleName='menu')
     click('Save As…', roleName='menu item')
-    click('Cancel', roleName='push button')
+    click('Cancel', roleName=pushButton)
 
     # Print
     focus.frame('test-links.pdf')
     click('File', roleName='menu')
     click('Print…', roleName='menu item')
     focus.dialog('Print')
-    click('Cancel', roleName='push button')
+    click('Cancel', roleName=pushButton)
 
     # Properties
     focus.frame('test-links.pdf')
@@ -34,7 +34,7 @@ try:
     click('Fonts', roleName='page tab')
     click('General', roleName='page tab')
     focus.dialog('Properties')
-    click('Close', roleName='push button')
+    click('Close', roleName=pushButton)
 
     # Close
     focus.frame('test-links.pdf')