Merge branch 'make-tests-more-robust' into 'master'

Make tests more robust

See merge request GregAshton/PyFstat!21

pyfstat/tcw_fstat_map_funcs.py

@@ -31,11 +31,8 @@ def _optional_import(modulename, shorthand=None):
         logging.debug("Successfully imported module %s%s." % (modulename, shorthandbit))
         success = True
     except ImportError as e:
-        if e.message == "No module named " + modulename:
-            logging.debug("No module {:s} found.".format(modulename))
-            success = False
-        else:
-            raise
+        logging.debug("Failed to import module {:s}.".format(modulename))
+        success = False
 
     return success
 

setup.py

@@ -31,6 +31,5 @@ setup(
         "bashplotlib",
         "peakutils",
         "pathos",
-        "pycuda",
     ],
 )

tests.py

@@ -5,7 +5,7 @@ import shutil
 import pyfstat
 import lalpulsar
 import logging
-
+import time
 
 class Test(unittest.TestCase):
     outdir = "TestData"
@@ -85,6 +85,7 @@ class Writer(Test):
         Writer.run_makefakedata()
         time_second = os.path.getmtime(Writer.sftfilepath)
         self.assertTrue(time_first == time_second)
+        time.sleep(1)  # make sure timestamp is actually different!
         os.system("touch {}".format(Writer.config_file_name))
         Writer.run_makefakedata()
         time_third = os.path.getmtime(Writer.sftfilepath)
@@ -550,12 +551,8 @@ class GridSearch(Test):
             tref=self.tref,
             Lambda0=[30, 0, 0, 0],
         )
-        search.run()
-        self.assertTrue(
-            os.path.isfile(
-                "{}/{}_slice_projection.png".format(search.outdir, search.label)
-            )
-        )
+        fig, axes = search.run(save=False)
+        self.assertTrue(fig is not None)
 
     def test_glitch_grid_search(self):
         search = pyfstat.GridGlitchSearch(