Implement comments to PR #2376

Author: mhsarmiento

astroquery/gaia/core.py

@@ -33,6 +33,7 @@
 from astropy import units as u
 import warnings
 from astroquery.exceptions import InputWarning
+from collections.abc import Iterable
 
 
 class GaiaClass(TapPlus):
@@ -925,10 +926,14 @@ def get_status_messages(self):
             connHandler = self._TapPlus__getconnhandler()
             response = connHandler.execute_tapget(subContext, False)
             if response.status == 200:
-                for line in response:
-                    string_message = line.decode("utf-8")
-                    print(string_message[string_message.index('=') + 1:])
-        except OSError as e:
+                if isinstance(response, Iterable):
+                    for line in response:
+                        try:
+                            print(line.decode("utf-8").split('=', 1)[1])
+                        except ValueError as e:
+                            print(e)
+                            pass
+        except OSError:
             print("Status messages could not be retrieved")
 
 

astroquery/gaia/tests/test_gaiatap.py

@@ -41,10 +41,50 @@ def data_path(filename):
 
 class TestTap:
 
+    def test_show_message(self):
+        connHandler = DummyConnHandler()
+
+        dummy_response = DummyResponse()
+        dummy_response.set_status_code(200)
+        dummy_response.set_message("OK")
+
+        message_text = "1653401204784D[type: -100,-1]=Gaia dev is under maintenance"
+
+        dummy_response.set_data(method='GET',
+                                context=None,
+                                body=message_text,
+                                headers=None)
+        connHandler.set_default_response(dummy_response)
+
+        # show_messages
+        tableRequest = 'notification?action=GetNotifications'
+        connHandler.set_response(tableRequest, dummy_response)
+
+        tapplus = TapPlus("http://test:1111/tap", connhandler=connHandler)
+        tap = GaiaClass(connHandler, tapplus, show_messages=True)
+
     def test_query_object(self):
         conn_handler = DummyConnHandler()
+        # Launch response: we use default response because the query contains
+        # decimals
+        dummy_response = DummyResponse()
+        dummy_response.set_status_code(200)
+        dummy_response.set_message("OK")
+
+        message_text = "1653401204784D[type: -100,-1]=Gaia dev is under maintenance"
+
+        dummy_response.set_data(method='GET',
+                                context=None,
+                                body=message_text,
+                                headers=None)
+        conn_handler.set_default_response(dummy_response)
+
+        # show_messages
+        tableRequest = 'notification?action=GetNotifications'
+        conn_handler.set_response(tableRequest, dummy_response)
+
         tapplus = TapPlus("http://test:1111/tap", connhandler=conn_handler)
-        tap = GaiaClass(conn_handler, tapplus, show_messages=False)
+        tap = GaiaClass(conn_handler, tapplus, show_messages=True)
         # Launch response: we use default response because the query contains
         # decimals
         response_launch_job = DummyResponse()
@@ -395,7 +435,7 @@ def test_load_data(self):
             output_file = os.path.abspath(path_to_end_with)
 
         params_dict = {}
-        params_dict['VALID_DATA'] = "false"
+        params_dict['VALID_DATA'] = "true"
         params_dict['ID'] = ids
         params_dict['FORMAT'] = str(format)
         params_dict['RETRIEVAL_TYPE'] = str(retrieval_type)