@@ -31,11 +31,10 @@ class TestMOCServerRemote:
3131
3232 # test of MAXREC payload
3333 @pytest .mark .skipif (not HAS_REGIONS , reason = "regions is required" )
34- @pytest .mark .parametrize ("max_rec" , [3 , 10 , 25 , 100 ])
34+ @pytest .mark .parametrize ("max_rec" , [3 , 10 ])
3535 def test_max_rec_param (self , max_rec ):
3636 center = coordinates .SkyCoord (ra = 10.8 , dec = 32.2 , unit = "deg" )
3737 radius = coordinates .Angle (1.5 , unit = "deg" )
38-
3938 cone_region = CircleSkyRegion (center , radius )
4039 result = MOCServer .query_region (
4140 region = cone_region , max_rec = max_rec , get_query_payload = False
@@ -49,9 +48,7 @@ def test_max_rec_param(self, max_rec):
4948 "field_l" ,
5049 [
5150 ["ID" ],
52- ["ID" , "moc_sky_fraction" ],
5351 ["data_ucd" , "vizier_popularity" , "ID" ],
54- ["publisher_id" , "ID" ],
5552 ],
5653 )
5754 def test_field_l_param (self , field_l ):
@@ -72,21 +69,15 @@ def test_field_l_param(self, field_l):
7269
7370 # test of moc_order payload
7471 @pytest .mark .parametrize ("moc_order" , [5 , 10 ])
75- def test_moc_order_param (self , moc_order , tmp_cwd ):
76- # We need a long timeout for this
77- MOCServer .TIMEOUT = 300
78-
79- moc_region = MOC .from_json ({"0" : [1 ]})
80-
72+ def test_moc_order_param (self , moc_order ):
73+ moc_region = MOC .from_str ("10/0-9" )
8174 result = MOCServer .query_region (
8275 region = moc_region ,
83- # return a mocpy obj
8476 return_moc = True ,
8577 max_norder = moc_order ,
86- get_query_payload = False ,
8778 )
88-
8979 assert isinstance (result , MOC )
80+ assert result .max_order == moc_order
9081
9182 @pytest .mark .parametrize (
9283 "meta_data_expr" ,
@@ -96,7 +87,5 @@ def test_find_data_sets(self, meta_data_expr):
9687 result = MOCServer .find_datasets (
9788 meta_data = meta_data_expr ,
9889 fields = ["ID" , "moc_sky_fraction" ],
99- get_query_payload = False ,
10090 )
101-
10291 assert isinstance (result , Table )
0 commit comments