diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-05-04 18:01:08 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-05-04 18:01:08 +0000 |
| commit | 7aaa8a26454cb80a072d637adfd46f0f5694b3f3 (patch) | |
| tree | 44e30a071461ca3c986168a8df3ed34713f788e5 /emu_test/test_console/utils/util.py | |
| parent | 32d478e595397f032b83fda8e7aaf405cc5d77af (diff) | |
| parent | fa8fa49af590d449a4f7af7e6406be200b5855e8 (diff) | |
| download | adt-infra-7aaa8a26454cb80a072d637adfd46f0f5694b3f3.tar.gz | |
release-request-1f23c1cc-67f0-4164-92f6-7dae0712394d-for-aosp-emu-2.4-release-3972579 snap-temp-L97500000060558537emu-2.4-release
Change-Id: If296675d1053a45b6638a6e97d1edd60f81a1825
Diffstat (limited to 'emu_test/test_console/utils/util.py')
| -rw-r--r-- | emu_test/test_console/utils/util.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/emu_test/test_console/utils/util.py b/emu_test/test_console/utils/util.py index 79495bf9..8efa0fdd 100644 --- a/emu_test/test_console/utils/util.py +++ b/emu_test/test_console/utils/util.py @@ -56,14 +56,25 @@ EVENTS_EV_TYPES_FILENAME = os.path.join(EVENT_DIR, 'EVENTS_EV_TYPES') PORT_NO_REDIR = 'no active redirections\r\nOK' PORT_REDIR_ADD = 'tcp:5556 => 5554 \r\nOK' CMD_HELP = 'help\n' -REGEX_HELP_DISPLAY_NO_AUTH = (r'.*\n.*\n.*help.*\n.*avd.*\n.*auth.*\n' - r'.*quit\|exit.*\n.*\n.*\nOK') -REGEX_HELP_DISPLAY_AUTH = (r'.*\n.*\n.*help.*\n.*event.*\n.*geo.*\n.*gsm.*\n' - r'.*cdma.*\n.*crash.*\n.*crash-on-exit.*\n' +REGEX_HELP_DISPLAY_NO_AUTH = (r'.*\n.*help.*\n.*help-verbose.*\n.*ping.*\n' + r'.*avd.*\n.*auth.*\n.*quit\|exit.*\n.*\n.*\n.*\nOK') +REGEX_HELP_DISPLAY_AUTH = (r'.*\n.*help.*\n.*help-verbose.*\n.*ping.*\n.*event.*\n' + r'.*geo.*\n.*gsm.*\n.*cdma.*\n.*crash.*\n.*crash-on-exit.*\n' r'.*kill.*\n.*network.*\n' r'.*power.*\n.*quit\|exit.*\n.*redir.*\n' r'.*sms.*\n.*avd.*\n.*qemu.*\n.*sensor.*\n.' - r'*finger.*\n.*debug.*\n.*rotate.*\n.*\n.*\nOK') + r'*finger.*\n.*debug.*\n.*rotate.*\n.*\n.*\n.*\nOK') +CMD_HELP_VERBOSE = 'help-verbose\n' +REGEX_HELP_VERBOSE_DISPLAY_NO_AUTH = ( + r'.*\n.*\n.*help.*\n.*help-verbose.*\n.*ping.*\n' + r'.*avd.*\n.*auth.*\n.*quit\|exit.*\n.*\n.*\nOK') +REGEX_HELP_VERBOSE_DISPLAY_AUTH = ( + r'.*\n.*\n.*help.*\n.*help-verbose.*\n.*ping.*\n.*event.*\n' + r'.*geo.*\n.*gsm.*\n.*cdma.*\n.*crash.*\n.*crash-on-exit.*\n' + r'.*kill.*\n.*network.*\n' + r'.*power.*\n.*quit\|exit.*\n.*redir.*\n' + r'.*sms.*\n.*avd.*\n.*qemu.*\n.*sensor.*\n.' + r'*finger.*\n.*debug.*\n.*rotate.*\n.*\n.*\nOK') AUTH = 'auth' CMD_RANDOM_AUTH_TOKEN = '%s axxB123cc\n' % AUTH CMD_EMPTY_AUTH_TOKEN = '%s \n' % AUTH |