Merge "Switch to origin/main for chromite" into main

OWNERS

diff --git a/OWNERS b/OWNERS
index 56d14a8..34c5bfd 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,4 @@
-jkop@chromium.org
-linxinan@chromium.org
+include chromiumos/chromite:/OWNERS.testplatform
+
+# Original author
 nya@chromium.org
-pprabhu@chromium.org
-zamorzaev@chromium.org

ci_results_archiver/importers/cidb_build_importer_unittest.py

diff --git a/ci_results_archiver/importers/cidb_build_importer_unittest.py b/ci_results_archiver/importers/cidb_build_importer_unittest.py
index 3437c07..97047b1 100644
--- a/ci_results_archiver/importers/cidb_build_importer_unittest.py
+++ b/ci_results_archiver/importers/cidb_build_importer_unittest.py
@@ -55,7 +55,7 @@
             'important': True,
             'buildbucket_id': 'someid',
             'deadline': datetime.datetime.fromtimestamp(1234567900, pytz.utc),
-            'branch': 'master',
+            'branch': 'main',
         },
         {
             'cidb_build_id': 1,
@@ -70,7 +70,7 @@
             'important': True,
             'buildbucket_id': 'someid',
             'deadline': datetime.datetime.fromtimestamp(1234567900, pytz.utc),
-            'branch': 'master',
+            'branch': 'main',
         },
     ], entries)
     self.assertEquals([], modify_ids)
@@ -126,7 +126,7 @@
     important=True,
     buildbucket_id='someid',
     timeout_seconds=10,
-    branch='master'):
+    branch='main'):
   """Creates args for FakeCIDBConnection.InsertBuild()."""
   # pylint: disable=unused-argument
   return dict(locals())