Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/api/test/features_servicer_test.py b/api/test/features_servicer_test.py
index 21154de..59d01c6 100644
--- a/api/test/features_servicer_test.py
+++ b/api/test/features_servicer_test.py
@@ -1,13 +1,13 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2018 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Tests for the projects servicer."""
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
+import pytest
import unittest
try:
from mox3 import mox
@@ -407,6 +407,7 @@
self.assertEqual(0, len(response.hotlists))
+ @pytest.mark.skip(reason='Test is flaky (https://crbug.com/monorail/12052)')
def testListHotlistsByIssue_NonProjectHotlists(self):
hotlist = self.services.features.CreateHotlist(
self.cnxn,