diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-01-08 10:44:01 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-01-08 10:44:01 +0100 |
| commit | 39d22245becab1c8d01971b88034027165a34d18 (patch) | |
| tree | c722b54f3461ec32065f0ed710774c778887edf5 /scripts/Util.py | |
| parent | Disable IceGrid GUI popup dialog that shows up if the IceBox observer can't b... (diff) | |
| download | ice-39d22245becab1c8d01971b88034027165a34d18.tar.bz2 ice-39d22245becab1c8d01971b88034027165a34d18.tar.xz ice-39d22245becab1c8d01971b88034027165a34d18.zip | |
Fixed Xamarin UWP/Android controller identities to prevent failures when multiple controllers are loaded
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index d866a4b2b38..50d868ea7bb 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2247,7 +2247,9 @@ class AndroidProcessController(RemoteProcessController): return "Android" def getControllerIdentity(self, current): - if isinstance(current.testcase.getMapping(), JavaCompatMapping): + if isinstance(current.testcase.getMapping(), CSharpMapping): + return "AndroidXamarin/ProcessController" + elif isinstance(current.testcase.getMapping(), JavaCompatMapping): return "AndroidCompat/ProcessController" else: return "Android/ProcessController" @@ -2485,7 +2487,10 @@ class UWPProcessController(RemoteProcessController): return "UWP" def getControllerIdentity(self, current): - return "UWP/ProcessController" + if isinstance(current.testcase.getMapping(), CSharpMapping): + return "UWPXamarin/ProcessController" + else: + return "UWP/ProcessController" def startControllerApp(self, current, ident): platform = current.config.buildPlatform |