From bdf7e18c2141695be21df74c1c5effc4719bc993 Mon Sep 17 00:00:00 2001
From: Dongdong Tian <seisman.info@gmail.com>
Date: Thu, 22 Apr 2021 18:04:05 -0400
Subject: [PATCH 1/2] Update fig.solar baseline images for GMT 6.2.0rc1

---
 .../tests/baseline/test_solar_set_terminator_datetime.png.dvc | 4 ++--
 pygmt/tests/baseline/test_solar_terminators.png.dvc           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pygmt/tests/baseline/test_solar_set_terminator_datetime.png.dvc b/pygmt/tests/baseline/test_solar_set_terminator_datetime.png.dvc
index caaab7eedce..2bb781a16c8 100644
--- a/pygmt/tests/baseline/test_solar_set_terminator_datetime.png.dvc
+++ b/pygmt/tests/baseline/test_solar_set_terminator_datetime.png.dvc
@@ -1,4 +1,4 @@
 outs:
-- md5: 0a7f4959b500b6fa3a560a6368db0f90
-  size: 25982
+- md5: 0f8baadcf84e0222b6a42a2525277c78
+  size: 25000
   path: test_solar_set_terminator_datetime.png
diff --git a/pygmt/tests/baseline/test_solar_terminators.png.dvc b/pygmt/tests/baseline/test_solar_terminators.png.dvc
index c7f3b4f2516..ef0fdad7373 100644
--- a/pygmt/tests/baseline/test_solar_terminators.png.dvc
+++ b/pygmt/tests/baseline/test_solar_terminators.png.dvc
@@ -1,4 +1,4 @@
 outs:
-- md5: 54c92bea64e0fc76c62601cb6131f22e
-  size: 44160
+- md5: 9854a8041fe4c5d8b3832446b77fb482
+  size: 41749
   path: test_solar_terminators.png

From 0b9544cfc67becce78032a21da2813e3f247259e Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Fri, 30 Apr 2021 14:42:04 +1200
Subject: [PATCH 2/2] Mark fig.solar tests with xfail

---
 pygmt/tests/test_solar.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pygmt/tests/test_solar.py b/pygmt/tests/test_solar.py
index d487dc30fc3..043f1ee9053 100644
--- a/pygmt/tests/test_solar.py
+++ b/pygmt/tests/test_solar.py
@@ -8,6 +8,10 @@
 from pygmt.exceptions import GMTInvalidInput
 
 
+@pytest.mark.xfail(
+    reason="Flaky test only passes with pytest on single module"
+    "See https://github.com/GenericMappingTools/pygmt/issues/1242"
+)
 @pytest.mark.mpl_image_compare
 def test_solar_terminators():
     """
@@ -39,6 +43,10 @@ def test_solar_terminators():
     return fig
 
 
+@pytest.mark.xfail(
+    reason="Flaky test only passes with pytest on single module"
+    "See https://github.com/GenericMappingTools/pygmt/issues/1242"
+)
 @pytest.mark.mpl_image_compare(filename="test_solar_set_terminator_datetime.png")
 @pytest.mark.parametrize(
     "terminator_datetime",
@@ -104,6 +112,10 @@ def test_invalid_datetime():
         )
 
 
+@pytest.mark.xfail(
+    reason="Flaky test only passes with pytest on single module"
+    "See https://github.com/GenericMappingTools/pygmt/issues/1242"
+)
 @pytest.mark.mpl_image_compare(filename="test_solar_set_terminator_datetime.png")
 def test_solar_default_terminator():
     """