diff --git a/.gitignore b/.gitignore index 17aba61..732cd13 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ var/* dist/ *egg-info* +config/droid_config.json diff --git a/config/droid_config.json b/config/droid_config.json index ab8e255..1f0f74a 100644 --- a/config/droid_config.json +++ b/config/droid_config.json @@ -1,6 +1,6 @@ { "thrift_host": "0.0.0.0", - "thrift_port": "9090", + "thrift_port": "9091", "droids": [ { "port": "5554", @@ -17,6 +17,38 @@ "ws_port": "6081", "clip": "580x1000+100+90", "dim": "768x1280x24" + }, + { + "port": "5558", + "avd": "nexus4-android7-3", + "display": "3", + "ws_port": "6082", + "clip": "580x1000+100+90", + "dim": "768x1280x24" + }, + { + "port": "5560", + "avd": "nexus4-android7-4", + "display": "4", + "ws_port": "6083", + "clip": "580x1000+100+90", + "dim": "768x1280x24" + }, + { + "port": "5562", + "avd": "nexus4-android7-5", + "display": "5", + "ws_port": "6084", + "clip": "580x1000+100+90", + "dim": "768x1280x24" + }, + { + "port": "5564", + "avd": "nexus4-android7-6", + "display": "6", + "ws_port": "6085", + "clip": "580x1000+100+90", + "dim": "768x1280x24" } ] } diff --git a/hedroid/master/thrift_server.py b/hedroid/master/thrift_server.py index 26a959e..4cd1916 100644 --- a/hedroid/master/thrift_server.py +++ b/hedroid/master/thrift_server.py @@ -1,11 +1,11 @@ import atexit from hedroid.logger import logger -from hedroid.constants import ErrorCode from hedroid.master.settings import THRIFT_HOST, THRIFT_PORT from hedroid.master.zk_master import MasterZkClient -from hedroid.master.tgen.droid_keeper.ttypes import ConnParams, ApplicationException +from hedroid.master.tgen.droid_keeper.ttypes import ConnParams +from hedroid.master.tgen.droid_keeper.ttypes import ApplicationException from hedroid.master.tgen.droid_keeper.ttypes import ErrCode from hedroid.master.tgen.droid_keeper import DroidKeeper diff --git a/hedroid/worker/vnc.py b/hedroid/worker/vnc.py index 4fa7414..44b9904 100644 --- a/hedroid/worker/vnc.py +++ b/hedroid/worker/vnc.py @@ -35,7 +35,7 @@ def portfile_wait(self): def _start(self): cmd = ["x11vnc", "-forever", "-rfbport", str(self.rfb_port), "-display", ":{}".format(self.display), - "-noxdamage", "-xkb", "-noscr", + # "-noxdamage", "-xkb", "-noscr", "-noxfixes", "-nowf", "-ncache", "10", "-clip", self.clip, "-flag", self._portfile_p, "-passwd", self.password]