Fix minor unit test failures:

- MiniSeedInputClient expects a stream as input, not a trace
  (like RawInputClient), and unit tests were designed around this;
  I reverted _put_channel() to its original design, which sends an
  entire stream instead of one trace at a time.
- I forgot to include a tiny change to RawInputClient_test that was
  part of the original (abandoned) MR
- I also made the read client timeout configurable

geomagio/edge/MiniSeedFactory.py

@@ -70,6 +70,8 @@ class MiniSeedFactory(TimeseriesFactory):
     sncl_mode: {'geomag','legacy'}
         force mode to convert common names to SEED SNCL codes (that is,
         station, network, channel, location codes); default = legacy
+    timeout: float
+        timeout for NEIC client; default=10
 
     See Also
     --------
@@ -105,6 +107,7 @@ class MiniSeedFactory(TimeseriesFactory):
         convert_channels: Optional[List[str]] = None,
         scale_factor: Optional[int] = None,
         sncl_mode: Optional[str] = "geomag",
+        timeout: Optional[float] = None,
     ):
         TimeseriesFactory.__init__(self, observatory, channels, type, interval)
         self.host = host or "edgecwb.usgs.gov"
@@ -116,6 +119,7 @@ class MiniSeedFactory(TimeseriesFactory):
         self.convert_channels = convert_channels or []
         self.scale_factor = scale_factor
         self.sncl_mode = sncl_mode
+        self.timeout = timeout or 10
         if sncl_mode == "legacy":
             self.get_sncl = LegacySNCL.get_sncl
         elif sncl_mode == "geomag":
@@ -123,6 +127,10 @@ class MiniSeedFactory(TimeseriesFactory):
         else:
             raise TimeseriesFactoryException("Unrecognized SNCL mode")
 
+        # instantiate clients immediately; allows mock clients if/when needed
+        self.client = neic.Client(self.host)
+        self.write_client = MiniSeedInputClient(self.host)
+
     def get_timeseries(
         self,
         starttime: UTCDateTime,
@@ -262,6 +270,8 @@ class MiniSeedFactory(TimeseriesFactory):
                 starttime,
                 endtime,
             )
+        # close socket
+        self.write_client.close()
 
     def get_calculated_timeseries(
         self,
@@ -407,9 +417,11 @@ class MiniSeedFactory(TimeseriesFactory):
         data = Stream()
         for port in ports:
             try:
-                client = neic.Client(self.host, port, timeout=10)
 
-                data += client.get_waveforms(
+                self.client.port = port
+                self.client.timeout = self.timeout
+
+                data += self.client.get_waveforms(
                     sncl.network,
                     sncl.station,
                     sncl.location,
@@ -638,9 +650,8 @@ class MiniSeedFactory(TimeseriesFactory):
         stream_masked = self._convert_stream_to_masked(
             timeseries=timeseries, channel=channel
         )
-        stream_split = stream_masked.split()
-
-        for trace in stream_split:
+        stream_send = Stream()
+        for trace in stream_masked.split():
             trace_send = trace.copy()
             trace_send.trim(starttime, endtime)
             if channel == "D":
@@ -657,21 +668,18 @@ class MiniSeedFactory(TimeseriesFactory):
                     # everything else (mostly magnetics stored as picoteslas)
                     trace_send.data = trace_send.data * (self.scale_factor or 1e3)
 
-            if self.write_port:
-                # FIXME: input clients should be rewritten for consistency,
-                #        allowing us to clean up stuff like this if-else-block
-                msic = MiniSeedInputClient(
-                    self.host, self.write_port, self.write_encoding
-                )
-                trace_send.stats.station = sncl.station
-                trace_send.stats.location = sncl.location
-                trace_send.stats.network = sncl.network
-                trace_send.stats.channel = sncl.channel
-                stream_send = Stream(trace_send)
-                msic.send(stream_send)
-                msic.close()
-            else:
-                raise TimeseriesFactoryException("Valid write port was not specified.")
+            trace_send.stats.station = sncl.station
+            trace_send.stats.location = sncl.location
+            trace_send.stats.network = sncl.network
+            trace_send.stats.channel = sncl.channel
+            stream_send += trace_send
+        # FIXME: MiniSeedInputClient sends a stream, while
+        #        RawInputClient sends a trace; these write
+        #        clients should be re-written for consistency
+        self.write_client.host = self.host
+        self.write_client.port = self.write_port
+        self.write_client.encoding = self.write_encoding
+        self.write_client.send(stream_send)
 
     def _set_metadata(
         self,

test/edge_test/RawInputClient_test.py

@@ -51,7 +51,8 @@ def test_raw_input_client():
         location=location,
         network=network,
     )
-    trace_send = EdgeFactory()._convert_trace_to_int(trace.copy())
+    trace_send = trace.copy()
+    trace_send.data = numpy.int32(trace_send.data * 1000)
     client.send_trace("minute", trace_send)
     # verify data was sent
     assert_equal(len(client.last_send), 1)