Fix & enable unit tests for injection and frame (gwastro#1035)

geoffrey4444 · Aug 19, 2016 · 113a278 · 113a278
1 parent 1d8fb91
commit 113a278
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/test/test_frame.py b/test/test_frame.py
@@ -28,12 +28,10 @@
 
 import pycbc
 import unittest
-from pycbc.types import *
-from pycbc.scheme import *
 import pycbc.frame
 import numpy
 import lal
-#from pylal import Fr
+from pycbc.types import TimeSeries
 from utils import parse_args_cpu_only, simple_exit
 
 # Frame tests only need to happen on the CPU

diff --git a/test/test_injection.py b/test/test_injection.py
@@ -38,7 +38,7 @@
 class MyInjection(object):
     def fill_sim_inspiral_row(self, row):
         # using dummy values for many fields, should work for our purposes
-        row.waveform = 'TaylorT4'
+        row.waveform = 'TaylorT4threePointFivePN'
         row.distance = self.distance
         total_mass = self.mass1 + self.mass2
         row.mass1 = self.mass1
@@ -140,7 +140,7 @@ def test_injection_presence(self):
                 # FIXME could test amplitude and time more precisely
                 self.assertTrue(max_amp > 0 and max_amp < 1e-10)
                 time_error = ts.sample_times.numpy()[max_loc] - inj.end_time
-                self.assertTrue(abs(time_error) < 1.5 * self.earth_time)
+                self.assertTrue(abs(time_error) < 2 * self.earth_time)
 
     def test_injection_absence(self):
         """Verify absence of signals outside known injection times"""

diff --git a/tools/run_travis.sh b/tools/run_travis.sh
@@ -33,14 +33,14 @@ test $? -ne 0 && RESULT=1
 #python test/test_fft_unthreaded.py
 #test $? -ne 0 && RESULT=1
 
-#python test/test_frame.py
-#test $? -ne 0 && RESULT=1
+python test/test_frame.py
+test $? -ne 0 && RESULT=1
 
 python test/test_frequencyseries.py
 test $? -ne 0 && RESULT=1
 
-#python test/test_injection.py
-#test $? -ne 0 && RESULT=1
+python test/test_injection.py
+test $? -ne 0 && RESULT=1
 
 python test/test_matchedfilter.py
 test $? -ne 0 && RESULT=1