Let all tests pass for GMT 6.1.1 and master (#668)

* Skip the xarray shading test on macOS
* Mark two info tests xfail before the bug is fixed
* Avoid checking undocumented status code

Author: seisman

pygmt/tests/test_clib.py

@@ -161,13 +161,8 @@ def test_call_module_error_message():
         try:
             lib.call_module("info", "bogus-data.bla")
         except GMTCLibError as error:
-            msg = "\n".join(
-                [
-                    "Module 'info' failed with status code 71:",
-                    "gmtinfo [ERROR]: Cannot find file bogus-data.bla",
-                ]
-            )
-            assert str(error) == msg
+            assert "Module 'info' failed with status code" in str(error)
+            assert "gmtinfo [ERROR]: Cannot find file bogus-data.bla" in str(error)
 
 
 def test_method_no_session():

pygmt/tests/test_grdimage.py

@@ -1,6 +1,7 @@
 """
 Test Figure.grdimage
 """
+import sys
 import numpy as np
 import pytest
 import xarray as xr
@@ -73,9 +74,9 @@ def test_grdimage_file():
     return fig
 
 
-@pytest.mark.xfail(
+@pytest.mark.skip(
     reason="Upstream bug in GMT 6.1.1",
-    condition=gmt_version <= Version("6.1.1"),
+    condition=gmt_version <= Version("6.1.1") and sys.platform == "darwin",
 )
 @check_figures_equal()
 @pytest.mark.parametrize(

pygmt/tests/test_info.py

@@ -8,17 +8,13 @@
 import pandas as pd
 import pytest
 import xarray as xr
-from packaging.version import Version
 
-from .. import clib, info
+from .. import info
 from ..exceptions import GMTInvalidInput
 
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data")
 POINTS_DATA = os.path.join(TEST_DATA_DIR, "points.txt")
 
-with clib.Session() as _lib:
-    gmt_version = Version(_lib.info["version"])
-
 
 def test_info():
     "Make sure info works on file name inputs"
@@ -43,7 +39,6 @@ def test_info_dataframe():
 
 
 @pytest.mark.xfail(
-    condition=gmt_version <= Version("6.1.1"),
     reason="UNIX timestamps returned instead of ISO datetime, should work on GMT 6.2.0 "
     "after https://github.com/GenericMappingTools/gmt/issues/4241 is resolved",
 )
@@ -63,7 +58,6 @@ def test_info_pandas_dataframe_time_column():
 
 
 @pytest.mark.xfail(
-    condition=gmt_version <= Version("6.1.1"),
     reason="UNIX timestamp returned instead of ISO datetime, should work on GMT 6.2.0 "
     "after https://github.com/GenericMappingTools/gmt/issues/4241 is resolved",
 )