make source tests python2 compatible

test/gw_source_test.py

@@ -21,17 +21,17 @@ class TestLalBBH(unittest.TestCase):
         del self.frequency_array
 
     def test_lal_bbh_works_runs_valid_parameters(self):
+        self.parameters.update(self.waveform_kwargs)
         self.assertIsInstance(
             bilby.gw.source.lal_binary_black_hole(
-                self.frequency_array, **self.parameters,
-                **self.waveform_kwargs), dict)
+                self.frequency_array, **self.parameters), dict)
 
     def test_mass_ratio_greater_one_returns_none(self):
         self.parameters['mass_2'] = 1000.0
+        self.parameters.update(self.waveform_kwargs)
         self.assertIsNone(
             bilby.gw.source.lal_binary_black_hole(
-                self.frequency_array, **self.parameters,
-                **self.waveform_kwargs), dict)
+                self.frequency_array, **self.parameters), dict)
 
     def test_lal_bbh_works_without_waveform_parameters(self):
         self.assertIsInstance(
@@ -56,17 +56,17 @@ class TestLalBNS(unittest.TestCase):
         del self.frequency_array
 
     def test_lal_bns_works_runs_valid_parameters(self):
+        self.parameters.update(self.waveform_kwargs)
         self.assertIsInstance(
             bilby.gw.source.lal_binary_neutron_star(
-                self.frequency_array, **self.parameters,
-                **self.waveform_kwargs), dict)
+                self.frequency_array, **self.parameters), dict)
 
     def test_mass_ratio_greater_one_returns_none(self):
         self.parameters['mass_2'] = 1000.0
+        self.parameters.update(self.waveform_kwargs)
         self.assertIsNone(
             bilby.gw.source.lal_binary_neutron_star(
-                self.frequency_array, **self.parameters,
-                **self.waveform_kwargs), dict)
+                self.frequency_array, **self.parameters), dict)
 
     def test_lal_bns_works_without_waveform_parameters(self):
         self.assertIsInstance(
@@ -76,16 +76,18 @@ class TestLalBNS(unittest.TestCase):
     def test_fails_without_tidal_parameters(self):
         self.parameters.pop('lambda_1')
         self.parameters.pop('lambda_2')
+        self.parameters.update(self.waveform_kwargs)
         with self.assertRaises(TypeError):
             bilby.gw.source.lal_binary_neutron_star(
-                self.frequency_array, **self.parameters, **self.waveform_kwargs)
+                self.frequency_array, **self.parameters)
 
     def test_fails_without_aligned_spins(self):
         self.parameters.pop('chi_1')
         self.parameters.pop('chi_2')
+        self.parameters.update(self.waveform_kwargs)
         with self.assertRaises(TypeError):
             bilby.gw.source.lal_binary_neutron_star(
-                self.frequency_array, **self.parameters, **self.waveform_kwargs)
+                self.frequency_array, **self.parameters)
 
 
 class TestEccentricLalBBH(unittest.TestCase):
@@ -105,17 +107,17 @@ class TestEccentricLalBBH(unittest.TestCase):
         del self.frequency_array
 
     def test_lal_ebbh_works_runs_valid_parameters(self):
+        self.parameters.update(self.waveform_kwargs)
         self.assertIsInstance(
             bilby.gw.source.lal_eccentric_binary_black_hole_no_spins(
-                self.frequency_array, **self.parameters,
-                **self.waveform_kwargs), dict)
+                self.frequency_array, **self.parameters), dict)
 
     def test_mass_ratio_greater_one_returns_none(self):
         self.parameters['mass_2'] = 1000.0
+        self.parameters.update(self.waveform_kwargs)
         self.assertIsNone(
             bilby.gw.source.lal_eccentric_binary_black_hole_no_spins(
-                self.frequency_array, **self.parameters,
-                **self.waveform_kwargs), dict)
+                self.frequency_array, **self.parameters), dict)
 
     def test_lal_ebbh_works_without_waveform_parameters(self):
         self.assertIsInstance(
@@ -124,9 +126,10 @@ class TestEccentricLalBBH(unittest.TestCase):
 
     def test_fails_without_eccentricity(self):
         self.parameters.pop('eccentricity')
+        self.parameters.update(self.waveform_kwargs)
         with self.assertRaises(TypeError):
             bilby.gw.source.lal_eccentric_binary_black_hole_no_spins(
-                self.frequency_array, **self.parameters, **self.waveform_kwargs)
+                self.frequency_array, **self.parameters)
 
 
 if __name__ == '__main__':