Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cacc978a authored by Charlie Boutier's avatar Charlie Boutier
Browse files

[Pandora] - Fix avatar_runner 

* use '*' instead of remainder to catch remaining argument to pass to
  mobly
* check delimiter properly

Test: manual
Bug: 260774624

Change-Id: I8cac425457095134546a56e1e2d214467f0d9692
parent 62e57dd8

android/pandora/test/runner.py

+2 −3
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ def run_test(args): 
  test_cmd = ['python3', args.test, '-c', args.config]

  if args.verbose:

    test_cmd.append('--verbose')

  if (delimiter := args.mobly_args.index('--')):

    test_cmd.extend(args.mobly_args[delimiter + 1:])

  test_cmd.extend(args.mobly_args)

  p = subprocess.Popen(test_cmd)

  p.wait(timeout=args.timeout)

  p.terminate()
@@ -110,7 +109,7 @@ if __name__ == '__main__': 
                      "--verbose",

                      action="store_true",

                      help="Set console logger level to DEBUG")

  parser.add_argument("mobly_args", nargs=argparse.REMAINDER)

  parser.add_argument("mobly_args", nargs='*')

  args = parser.parse_args()

  console_level = logging.DEBUG if args.verbose else logging.INFO

  logging.basicConfig(level=console_level)