From e1096de78472d7f16358a22e4ac5fcf9e96fe95b Mon Sep 17 00:00:00 2001
From: Simon Hawkins <simonjayhawkins@gmail.com>
Date: Sat, 1 Aug 2020 13:46:27 +0100
Subject: [PATCH] Backport PR #35502: CI: xfail numpy-dev

---
 pandas/tests/indexes/common.py    | 12 +++++++++++-
 pandas/tests/indexing/test_loc.py |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pandas/tests/indexes/common.py b/pandas/tests/indexes/common.py
index c8b780455f862..f5b9f4a401e60 100644
--- a/pandas/tests/indexes/common.py
+++ b/pandas/tests/indexes/common.py
@@ -5,6 +5,7 @@
 import pytest
 
 from pandas._libs import iNaT
+from pandas.compat.numpy import _is_numpy_dev
 from pandas.errors import InvalidIndexError
 
 from pandas.core.dtypes.common import is_datetime64tz_dtype
@@ -417,7 +418,7 @@ def test_set_ops_error_cases(self, case, method, index):
         with pytest.raises(TypeError, match=msg):
             getattr(index, method)(case)
 
-    def test_intersection_base(self, index):
+    def test_intersection_base(self, index, request):
         if isinstance(index, CategoricalIndex):
             return
 
@@ -434,6 +435,15 @@ def test_intersection_base(self, index):
         # GH 10149
         cases = [klass(second.values) for klass in [np.array, Series, list]]
         for case in cases:
+            # https://github.com/pandas-dev/pandas/issues/35481
+            if (
+                _is_numpy_dev
+                and isinstance(case, Series)
+                and isinstance(index, UInt64Index)
+            ):
+                mark = pytest.mark.xfail(reason="gh-35481")
+                request.node.add_marker(mark)
+
             result = first.intersection(case)
             assert tm.equalContents(result, second)
 
diff --git a/pandas/tests/indexing/test_loc.py b/pandas/tests/indexing/test_loc.py
index 30b13b6ea9fce..193800fae751f 100644
--- a/pandas/tests/indexing/test_loc.py
+++ b/pandas/tests/indexing/test_loc.py
@@ -5,6 +5,8 @@
 import numpy as np
 import pytest
 
+from pandas.compat.numpy import _is_numpy_dev
+
 import pandas as pd
 from pandas import DataFrame, Series, Timestamp, date_range
 import pandas._testing as tm
@@ -945,6 +947,7 @@ def test_loc_setitem_empty_append(self):
         df.loc[0, "x"] = expected.loc[0, "x"]
         tm.assert_frame_equal(df, expected)
 
+    @pytest.mark.xfail(_is_numpy_dev, reason="gh-35481")
     def test_loc_setitem_empty_append_raises(self):
         # GH6173, various appends to an empty dataframe