From b86c38e67814da2fb88c27b6b8c9b60fa835cbfc Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 5 Oct 2021 22:37:44 +1300 Subject: [PATCH] Refactor x2sys_cross to remove verbose info and return output statements Silences captured stderr messages in the log. --- pygmt/tests/test_x2sys_cross.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pygmt/tests/test_x2sys_cross.py b/pygmt/tests/test_x2sys_cross.py index 4659467922e..ffbeca6cee2 100644 --- a/pygmt/tests/test_x2sys_cross.py +++ b/pygmt/tests/test_x2sys_cross.py @@ -44,15 +44,13 @@ def test_x2sys_cross_input_file_output_file(mock_x2sys_home): x2sys_init(tag=tag, fmtfile="xyz", force=True) outfile = os.path.join(tmpdir, "tmp_coe.txt") output = x2sys_cross( - tracks=["@tut_ship.xyz"], tag=tag, coe="i", outfile=outfile, verbose="i" + tracks=["@tut_ship.xyz"], tag=tag, coe="i", outfile=outfile ) assert output is None # check that output is None since outfile is set assert os.path.exists(path=outfile) # check that outfile exists at path _ = pd.read_csv(outfile, sep="\t", header=2) # ensure ASCII text file loads ok - return output - def test_x2sys_cross_input_file_output_dataframe(mock_x2sys_home): """ @@ -62,7 +60,7 @@ def test_x2sys_cross_input_file_output_dataframe(mock_x2sys_home): with TemporaryDirectory(prefix="X2SYS", dir=os.getcwd()) as tmpdir: tag = os.path.basename(tmpdir) x2sys_init(tag=tag, fmtfile="xyz", force=True) - output = x2sys_cross(tracks=["@tut_ship.xyz"], tag=tag, coe="i", verbose="i") + output = x2sys_cross(tracks=["@tut_ship.xyz"], tag=tag, coe="i") assert isinstance(output, pd.DataFrame) assert output.shape == (14294, 12) @@ -70,8 +68,6 @@ def test_x2sys_cross_input_file_output_dataframe(mock_x2sys_home): assert columns[:6] == ["x", "y", "i_1", "i_2", "dist_1", "dist_2"] assert columns[6:] == ["head_1", "head_2", "vel_1", "vel_2", "z_X", "z_M"] - return output - def test_x2sys_cross_input_dataframe_output_dataframe(mock_x2sys_home, tracks): """ @@ -82,7 +78,7 @@ def test_x2sys_cross_input_dataframe_output_dataframe(mock_x2sys_home, tracks): tag = os.path.basename(tmpdir) x2sys_init(tag=tag, fmtfile="xyz", force=True) - output = x2sys_cross(tracks=tracks, tag=tag, coe="i", verbose="i") + output = x2sys_cross(tracks=tracks, tag=tag, coe="i") assert isinstance(output, pd.DataFrame) assert output.shape == (14, 12) @@ -92,8 +88,6 @@ def test_x2sys_cross_input_dataframe_output_dataframe(mock_x2sys_home, tracks): assert output.dtypes["i_1"].type == np.object_ assert output.dtypes["i_2"].type == np.object_ - return output - def test_x2sys_cross_input_two_dataframes(mock_x2sys_home): """ @@ -120,7 +114,7 @@ def test_x2sys_cross_input_two_dataframes(mock_x2sys_home): track["time"] = pd.date_range(start=f"2020-{i}1-01", periods=10, freq="ms") tracks.append(track) - output = x2sys_cross(tracks=tracks, tag=tag, coe="e", verbose="i") + output = x2sys_cross(tracks=tracks, tag=tag, coe="e") assert isinstance(output, pd.DataFrame) assert output.shape == (30, 12) @@ -171,9 +165,7 @@ def test_x2sys_cross_input_two_filenames(mock_x2sys_home): ) as fname: np.savetxt(fname=fname, X=np.random.rand(10, 3)) - output = x2sys_cross( - tracks=["track_0.xyz", "track_1.xyz"], tag=tag, coe="e", verbose="i" - ) + output = x2sys_cross(tracks=["track_0.xyz", "track_1.xyz"], tag=tag, coe="e") assert isinstance(output, pd.DataFrame) assert output.shape == (24, 12) @@ -182,8 +174,6 @@ def test_x2sys_cross_input_two_filenames(mock_x2sys_home): assert columns[6:] == ["head_1", "head_2", "vel_1", "vel_2", "z_X", "z_M"] _ = [os.remove(f"track_{i}.xyz") for i in range(2)] # cleanup track files - return output - def test_x2sys_cross_invalid_tracks_input_type(tracks): """