TST: unrelated test fix, rebase should resolve it

astropy · Oct 9, 2024 · e676bee · e676bee
1 parent fead6bc
commit e676bee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pyvo/registry/tests/test_regtap.py b/pyvo/registry/tests/test_regtap.py
@@ -88,8 +88,8 @@ def keywordstest_callback(request, context):
         data = dict(parse_qsl(request.body))
         query = data['QUERY']
 
-        assert (" UNION SELECT ivoid FROM rr.res_subject WHERE"
-            " rr.res_subject.res_subject ILIKE '%single%'") in query
+        assert (" UNION ALL SELECT DISTINCT ivoid FROM rr.res_subject WHERE "
+                "rr.res_subject.res_subject ILIKE '%single%'") in query
         assert "1=ivo_hasword(res_description, 'single') " in query
         assert "1=ivo_hasword(res_title, 'single')" in query
 

diff --git a/pyvo/registry/tests/test_rtcons.py b/pyvo/registry/tests/test_rtcons.py
@@ -304,8 +304,9 @@ def test_moc(self):
 
     def test_moc_and_inclusive(self):
         cons = registry.Spatial("0/1-3 3/", inclusive=True)
-        assert cons.get_search_condition(FAKE_GAVO) == \
-            "ivoid IN (SELECT DISTINCT ivoid FROM rr.stc_spatial WHERE 1 = CONTAINS(MOC('0/1-3 3/'), coverage)) OR coverage IS NULL"
+        assert cons.get_search_condition(FAKE_GAVO) == (
+            "ivoid IN (SELECT DISTINCT ivoid FROM rr.stc_spatial WHERE 1 = "
+            "CONTAINS(MOC('0/1-3 3/'), coverage) OR coverage IS NULL)")
 
     def test_SkyCoord(self):
         cons = registry.Spatial(SkyCoord(3 * u.deg, -30 * u.deg))