[updater] pass build dir to tests.

Also changes test case superclass to typ.TestCase.

Bug: 1141577
Change-Id: I0d9b4b38543d1cd904808d9f85b6aa27ab973c5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2496180Reviewed-by: Sorin Jianu <sorin@chromium.org>
Commit-Queue: Anjali Doneria <adoneria@google.com>
Cr-Commit-Position: refs/heads/master@{#820849}

chrome/updater/BUILD.gn

@@ -347,9 +347,13 @@ if (is_win || is_mac) {
   script_test("updater_integration_tests") {
     script = "//testing/scripts/run_isolated_script_test.py"
 
-    args = [ "@WrappedPath(" +
-             rebase_path("//chrome/updater/run_updater_tests.py",
-                         root_build_dir) + ")" ]
+    args = [
+      "@WrappedPath(" +
+          rebase_path("//chrome/updater/run_updater_tests.py", root_build_dir) +
+          ")",
+      "--build-dir",
+      "@WrappedPath(" + rebase_path(root_build_dir) + ")",
+    ]
 
     data = [
       "//chrome/updater/run_updater_tests.py",

chrome/updater/run_updater_tests.py

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import argparse
+import logging
 import sys
 
 from test.integration_tests.common import path_finder
@@ -9,12 +11,34 @@ path_finder.add_typ_dir_to_sys_path()
 
 import typ
 
+class Context(object):
+  def __init__(self, build_dir):
+    self.build_dir = build_dir
+
 
 def main():
-  return typ.main(
-      tests=[path_finder.get_integration_tests_dir()],
-  )
+  parser = typ.ArgumentParser()
+  parser.add_argument('--build-dir',
+                      help='Specifies chromium build directory.')
+
+  runner = typ.Runner()
+
+  # Set this when using context that will be passed to tests.
+  runner.win_multiprocessing = typ.WinMultiprocessing.importable
+
+  runner.parse_args(parser,
+                    argv=None,
+                    tests=[path_finder.get_integration_tests_dir()])
+
+  # setup logging level
+  if runner.args.verbose > 1:
+    level = logging.DEBUG
+  else:
+    level = logging.INFO
+  logging.basicConfig(level=level)
 
+  runner.context = Context(runner.args.build_dir)
+  return runner.run()[0]
 
 if __name__ == "__main__":
-    sys.exit(main())
+  sys.exit(main())

chrome/updater/test/integration_tests/hello_test.py

@@ -4,13 +4,20 @@
 
 """Sample test case to run on chromium infra."""
 
-import unittest
+import logging
+import typ
 
-class HelloTest(unittest.TestCase):
+class HelloTest(typ.TestCase):
 
   def test_hello(self):
+    logging.info('Hello World!')
     pass
 
+  def test_build_dir(self):
+    logging.debug('Build dir = %s', self.context.build_dir)
+    self.assertTrue(self.context.build_dir is not None)
+
+
 if __name__ == '__main__':
   unittest.main()
 

chrome/updater/test/integration_tests/updater/test_base.py

@@ -12,13 +12,12 @@ intended action before test run and after test run respectively.
 
 import logging
 import os
-import unittest
-
+import typ
 from test.integration_tests.common import logger_util
 from test.integration_tests.updater.lib import updater_util
 
 
-class UpdaterTestBase(unittest.TestCase):
+class UpdaterTestBase(typ.TestCase):
   """Base test class for updater testing on new infra."""
 
   @classmethod