From 4552ef40f4263ebc3ca6f343bcf9fdd56758021f Mon Sep 17 00:00:00 2001 From: Anne Archibald Date: Mon, 23 Aug 2021 19:55:06 +0100 Subject: [PATCH] Clean up merge mess --- tests/test_astrometry.py | 1 - tests/test_timing_model.py | 17 +++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/test_astrometry.py b/tests/test_astrometry.py index c95a8045a..4c2e3da4d 100644 --- a/tests/test_astrometry.py +++ b/tests/test_astrometry.py @@ -8,7 +8,6 @@ from pinttestdata import datadir from pint.models import get_model -from pinttestdata import datadir @pytest.fixture diff --git a/tests/test_timing_model.py b/tests/test_timing_model.py index 20724c4b7..bf563146b 100644 --- a/tests/test_timing_model.py +++ b/tests/test_timing_model.py @@ -6,11 +6,8 @@ import astropy.units as u import numpy as np import pytest -from numpy.testing import assert_allclose -from pinttestdata import datadir -from pint.simulation import make_fake_toas_uniform -from pint.toa import get_TOAs from astropy.time import Time +from numpy.testing import assert_allclose from pinttestdata import datadir from pint.models import ( @@ -343,6 +340,12 @@ def test_jump_flags_to_params(timfile_jumps, timfile_nojumps, model_0437): m.jump_flags_to_params(t) assert "PhaseJump" in m.components assert len(m.components["PhaseJump"].jumps) == 2 + assert ("jump", "1") in [ + (j.flag, j.flag_value) for j in m.components["PhaseJump"].jumps + ] + assert ("jump", "2") in [ + (j.flag, j.flag_value) for j in m.components["PhaseJump"].jumps + ] def test_supports_rm(): @@ -357,9 +360,3 @@ def test_assumes_dmepoch_equals_pepoch(): t = make_fake_toas_uniform(57000, 59000, 10, m_assume) assert_allclose(m_assume.dm_value(t), m_given.dm_value(t)) - assert ("jump", "1") in [ - (j.flag, j.flag_value) for j in m.components["PhaseJump"].jumps - ] - assert ("jump", "2") in [ - (j.flag, j.flag_value) for j in m.components["PhaseJump"].jumps - ]