Remove test changes

Author: PussInDasBoot

tests/test_seismic/conftest.py

@@ -5,7 +5,6 @@
 
 import os
 import copy
-import obspy
 import pytest
 
 from seismic.network_event_dataset import NetworkEventDataset
@@ -55,9 +54,3 @@ def ned_rotation_error(_master_event_dataset, request):
     ned.apply(lambda stream: correct_back_azimuth(None, stream, baz_correction=request.param))
     ned.param = request.param
     return ned
-
-@pytest.fixture(scope='session')
-def obspy_stats():
-    starttime = obspy.UTCDateTime('2020-02-05T15:00:00')
-    return obspy.core.Stats({'sampling_rate': 10, 'npts': 300, 'inclination': 22,
-                              'starttime': starttime, 'onset': starttime + 5})

tests/test_seismic/test_stream_curation.py

@@ -8,12 +8,16 @@
 from seismic.stream_quality_filter import curate_stream3c
 
 
-def test_curate_stream(obspy_stats):
+def test_curate_stream():
+    npts = 300
+    starttime = obspy.UTCDateTime('2020-02-05T15:00:00')
+    stats = obspy.core.Stats({'sampling_rate': 10, 'npts': npts, 'inclination': 22,
+                              'starttime': starttime, 'onset': starttime + 5})
     clean_stream = obspy.Stream()
     for channel in ['BHZ', 'BHN', 'BHE']:
-        obspy_stats.update({'channel': channel})
-        data = np.random.rand(300)
-        trace = obspy.Trace(data, obspy_stats)
+        stats.update({'channel': channel})
+        data = np.random.rand(npts)
+        trace = obspy.Trace(data, stats)
         assert trace.stats.endtime > trace.stats.starttime
         clean_stream += trace
     # end for

tests/test_seismic/test_stream_processing.py

@@ -6,17 +6,15 @@
 
 import numpy as np
 import obspy
-from unittest.mock import MagicMock, patch
-import pytest
 
-from seismic.stream_processing import zne_order, zrt_order, zerophase_resample
+from seismic.stream_processing import zne_order, zrt_order
 
 
 def test_trace_ordering():
-    test_stream = obspy.Stream([obspy.Trace(np.random.rand(20)) for _ in range(4)])
+    test_stream = obspy.Stream([obspy.Trace(np.random.rand(20)) for _ in range(3)])
 
     # Test ZNE ordering
-    ordered = ('BHZ', 'BHN', 'BHE', 'BHY')
+    ordered = ('BHZ', 'BHN', 'BHE')
     for perm in itertools.permutations(ordered):
         for i, tr in enumerate(test_stream):
             tr.stats.channel = perm[i]
@@ -26,7 +24,7 @@ def test_trace_ordering():
     # end for
 
     # Test ZRT ordering
-    ordered = ('BHZ', 'BHR', 'BHT', 'BHY')
+    ordered = ('BHZ', 'BHR', 'BHT')
     for perm in itertools.permutations(ordered):
         for i, tr in enumerate(test_stream):
             tr.stats.channel = perm[i]
@@ -37,18 +35,7 @@ def test_trace_ordering():
 
 # end func
 
-def test_zerophase_resampling_with_invalid_types():
-    # Test invalid item, not Stream or Trace
-    with pytest.raises(TypeError):
-        zerophase_resample(123, 10)
 
-@patch('seismic.stream_processing.lowpass')
-def test_zerophase_resampling_success(mocked_lowpass, obspy_stats):
-    # Test trace gets resampled and lowpass is called if resample_hz < sampling_rate
-    mocked_resample = MagicMock(spec=obspy.Trace.resample)
-    mock_trace = MagicMock(spec=obspy.Trace, data=np.array([1,2,3,4]), stats=obspy_stats, resample=mocked_resample)
-
-    zerophase_resample(mock_trace, 1)
-
-    mocked_resample.assert_called()
-    mocked_lowpass.assert_called()
+if __name__ == "__main__":
+    test_trace_ordering()
+# end if