From fbb7d36a75281b5f0a21b211e67a8df9ae564583 Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Wed, 26 May 2021 15:41:42 +1200
Subject: [PATCH] Remove xfails on grdimage test for GMT 6.2.0rc2

Since `test_grdimage_shading_xarray` runs properly in GMT
6.2.0, the expected failure (xfail) marker can be removed.
---
 pygmt/tests/test_grdimage.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/pygmt/tests/test_grdimage.py b/pygmt/tests/test_grdimage.py
index 2927c95e1d1..a3ea9954337 100644
--- a/pygmt/tests/test_grdimage.py
+++ b/pygmt/tests/test_grdimage.py
@@ -1,20 +1,14 @@
 """
 Test Figure.grdimage.
 """
-import sys
-
 import numpy as np
 import pytest
 import xarray as xr
-from packaging.version import Version
-from pygmt import Figure, clib
+from pygmt import Figure
 from pygmt.datasets import load_earth_relief
 from pygmt.exceptions import GMTInvalidInput
 from pygmt.helpers.testing import check_figures_equal
 
-with clib.Session() as _lib:
-    gmt_version = Version(_lib.info["version"])
-
 
 @pytest.fixture(scope="module", name="grid")
 def fixture_grid():
@@ -82,14 +76,6 @@ def test_grdimage_file():
     return fig
 
 
-@pytest.mark.skipif(
-    gmt_version <= Version("6.1.1") and sys.platform == "darwin",
-    reason="Upstream bug in GMT 6.1.1 that causes segfault on macOS",
-)
-@pytest.mark.xfail(
-    condition=gmt_version <= Version("6.1.1") and sys.platform != "darwin",
-    reason="Upstream bug in GMT 6.1.1 that causes this test to fail on Linux/Windows",
-)
 @check_figures_equal()
 @pytest.mark.parametrize(
     "shading",