Skip to content

System tests/Python 3: syntax and imports #9801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelDCurran merged 3 commits into from
Jun 24, 2019
Merged

System tests/Python 3: syntax and imports #9801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
320e230
System tests: xmlrpclib and SimpleXMLRPCServer -> xmlrpc. Re #9798.
josephsl Jun 24, 2019
dad8d79
System tests/library: use relative import.
josephsl Jun 24, 2019
9745381
System tests: basestring -> str.
josephsl Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/system/libraries/nvdaRobotLib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ def _findDepPath(depFileName, searchPaths):
# relative to the python path
requiredPythonImportsForSystemTestSpyPackage = [
r"robotremoteserver",
r"SimpleXMLRPCServer",
r"xmlrpclib",
r"xmlrpc",
]

def _createNvdaSpyPackage():
Expand Down
6 changes: 3 additions & 3 deletions tests/system/libraries/systemTestSpy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"""
import globalPluginHandler
import threading
from systemTestUtils import _blockUntilConditionMet
from .systemTestUtils import _blockUntilConditionMet
from logHandler import log
from time import clock as _timer

Expand Down Expand Up @@ -64,7 +64,7 @@ def _flattenCommandsSeparatingWithNewline(self, commandArray):

def _getJoinedBaseStringsFromCommands(self, speechCommandArray):
wsChars = whitespaceMinusSlashN
baseStrings = [c.strip(wsChars) for c in speechCommandArray if isinstance(c, basestring)]
baseStrings = [c.strip(wsChars) for c in speechCommandArray if isinstance(c, str)]
return ''.join(baseStrings).strip()

# Public methods
Expand Down Expand Up @@ -95,7 +95,7 @@ def getIndexOfSpeech(self, speech, startFromIndex=0):
with threading.Lock():
for index, commands in enumerate(self._nvdaSpeech[startFromIndex:]):
index = index + startFromIndex
baseStrings = [c.strip() for c in commands if isinstance(c, basestring)]
baseStrings = [c.strip() for c in commands if isinstance(c, str)]
if any(speech in x for x in baseStrings):
return index
return -1
Expand Down