added tests, fixed code style.

Author: prajwel

astroquery/astrometry_net/core.py

@@ -214,16 +214,16 @@ def monitor_submission(self, submission_id, *,
         verbose : bool, optional
             Whether to print out information about the solving.
         return_job_id : bool, optional
-            Whether to return the Submission ID number (called Job ID on Astrometry.net).            
+            Whether to return the Submission ID number (called Job ID on Astrometry.net).
 
         Returns
         -------
 
         None or `astropy.io.fits.Header` or (`astropy.io.fits.Header`, str)
             The contents of the returned object depend on whether the solve
             succeeds or fails. If the solve succeeds the header with
-            the WCS solution generated by astrometry.net is returned. A tuple 
-            containing WCS solution and Submission ID is return if the 
+            the WCS solution generated by astrometry.net is returned. A tuple
+            containing WCS solution and Submission ID is return if the
             return_job_id parameter is set True. If the solve
             fails then an empty dictionary is returned. See below for the outcome
             if the solve times out.
@@ -272,7 +272,7 @@ def monitor_submission(self, submission_id, *,
         else:
             # Try to future-proof a little bit
             raise RuntimeError('Unrecognized status {}'.format(status))
-        if return_job_id == False:    
+        if return_job_id is False:
             return wcs
         else:
             return (wcs, submission_id)
@@ -303,7 +303,7 @@ def solve_from_source_list(self, x, y, image_width, image_height, *,
         verbose : bool, optional
             Whether to print out information about the solving.
         return_job_id : bool, optional
-            Whether to return the Submission ID number (called Job ID on Astrometry.net).              
+            Whether to return the Submission ID number (called Job ID on Astrometry.net).
 
         For a list of the remaining settings, use the method
         `~AstrometryNetClass.show_allowed_settings`.
@@ -380,9 +380,9 @@ def solve_from_image(self, image_file_path, *, force_image_upload=False,
 
         verbose : bool, optional
             Whether to print out information about the solving.
-            
+
         return_job_id : bool, optional
-            Whether to return the Submission ID number (called Job ID on Astrometry.net).              
+            Whether to return the Submission ID number (called Job ID on Astrometry.net).
 
         For a list of the remaining settings, use the method
         `~AstrometryNetClass.show_allowed_settings`.

astroquery/astrometry_net/tests/test_astrometry_net_remote.py

@@ -152,3 +152,36 @@ def test_solve_timeout_behavior():
         except TypeError:
             pass
         assert difference == 0
+
+
+@pytest.mark.skipif(not api_key, reason='API key not set.')
+@pytest.mark.remote_data
+def test_solve_from_image_default_behaviour():
+    # Test that solving by uploading an image works
+    a = AstrometryNet()
+    a.api_key = api_key
+    sources = Table.read(os.path.join(DATA_DIR, 'test-source-list.fit'))
+    # The image_width, image_height and crpix_center below are set to match the
+    # original solve on astrometry.net.
+    result = a.solve_from_source_list(sources['X'], sources['Y'],
+                                      4109, 4096,
+                                      crpix_center=True)
+
+    assert isinstance(result, fits.Header)
+
+
+@pytest.mark.skipif(not api_key, reason='API key not set.')
+@pytest.mark.remote_data
+def test_solve_from_image_with_return_job_id():
+    # Test that solving by uploading an image works
+    a = AstrometryNet()
+    a.api_key = api_key
+    sources = Table.read(os.path.join(DATA_DIR, 'test-source-list.fit'))
+    # The image_width, image_height and crpix_center below are set to match the
+    # original solve on astrometry.net.
+    result = a.solve_from_source_list(sources['X'], sources['Y'],
+                                      4109, 4096,
+                                      crpix_center=True,
+                                      return_job_id=True)
+
+    assert isinstance(result, tuple)