Fix tests with AT-SPI2 >= 2.53failing-tests

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, 3 insertions, 7 deletions

diff --git a/test/test6.py b/test/test6.py
index a2687d08..30367fe2 100755
--- a/test/test6.py
+++ b/test/test6.py
@@ -3,15 +3,11 @@
 # Test printing
 
 import os
-import dogtail.config
-dogtail.config.config.logDebugToStdOut = True
-dogtail.config.config.logDebugToFile = False
+from testCommon import pushButton
+from dogtail.procedural import *
 
-os.environ['LANG']='C'
 srcdir = os.environ['srcdir']
 
-from dogtail.procedural import *
-
 recent_used = os.path.expanduser('~/.local/share/recently-used.xbel')
 recent_used_orig = recent_used + '.orig'
 
@@ -31,7 +27,7 @@ click('Print…', roleName='menu item')
 
 click('Print to File', roleName='table cell', raw=True)
 click('Postscript', roleName='radio button', raw=True)
-click('Print', roleName='push button')
+click('Print', roleName=pushButton)
 
 statinfo = os.stat (ps_file)
 if statinfo.st_size > 100000: