Skip to content

Commit

Permalink
Merge pull request #1367 from Cadair/lyra_millisecond_fix
Browse files Browse the repository at this point in the history
fix the tests for lyra lightcurve.
  • Loading branch information
Cadair committed Mar 31, 2015
2 parents ace99a0 + 9fa592a commit 927f72e
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions sunpy/lightcurve/tests/test_lyra.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@pytest.mark.online
@pytest.mark.parametrize("date,level,start,end",
[('2012/06/03',3,'2012-06-03 00:00:00.047000','2012-06-03 23:59:00.047000'),
('2012/06/03',2,'2012-06-03 00:00:00.047000','2012-06-03 23:59:59.047000')
('2012/06/03',2,'2012-06-03 00:00:00.144000','2012-06-04 00:00:00.042999')
])
def test_lyra_level(date, level,start, end):
lyra = sunpy.lightcurve.LYRALightCurve.create(date, level=level)
Expand All @@ -21,20 +21,6 @@ def test_lyra_level(date, level,start, end):
assert lyra.time_range().end == parse_time(end)



@pytest.mark.online
@pytest.mark.parametrize("date,start,end",
[('2011/02/06', '2011-02-06 00:00:00.008500', '2011-02-06 23:59:59.008500'),
('2012/08/04', '2012-08-04 00:00:00.043000', '2012-08-04 23:59:59.043000'),
])

def test_lyra_date(date, start, end):

lyra = sunpy.lightcurve.LYRALightCurve.create(date)
assert isinstance(lyra, sunpy.lightcurve.LYRALightCurve)
assert lyra.time_range().start == parse_time(start)
assert lyra.time_range().end == parse_time(end)

@pytest.mark.online
@pytest.mark.parametrize(("url, start, end"),
[('http://proba2.oma.be/lyra/data/bsd/2012/02/04/lyra_20120204-000000_lev3_std.fits', '2012-02-04 00:00:00.004000', '2012-02-04 23:59:00.004000'),
Expand All @@ -47,5 +33,3 @@ def test_online(url, start, end):
assert lyra.time_range().start == parse_time(start)
assert lyra.time_range().end == parse_time(end)



0 comments on commit 927f72e

Please sign in to comment.