From f89dff5c0ba1706088fe754ec741afbe9a4685e9 Mon Sep 17 00:00:00 2001
From: arigdon-usgs <arigdon@usgs.gov>
Date: Tue, 31 Jul 2018 08:06:42 -0600
Subject: [PATCH] changed unit test to see what was being overwritten

---
 test/TimeseriesUtility_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/TimeseriesUtility_test.py b/test/TimeseriesUtility_test.py
index 593ad1f8..04483dd9 100644
--- a/test/TimeseriesUtility_test.py
+++ b/test/TimeseriesUtility_test.py
@@ -179,7 +179,7 @@ def test_merge_streams():
             True)
 
     trace10 = __create_trace('H', [1, 1, numpy.nan, numpy.nan, 1, 1])
-    trace11 = __create_trace('H', [1, 2, 2, 1])
+    trace11 = __create_trace('H', [2, 2, 2, 2])
     trace10.stats.starttime = UTCDateTime('2018-01-01T00:00:00Z')
     trace11.stats.starttime = UTCDateTime('2018-01-01T00:01:00Z')
     timeseries4 = Stream(traces=[trace10, trace11])
@@ -187,4 +187,4 @@ def test_merge_streams():
     assert_equals(len(merged4[0].data), 6)
     assert_almost_equal(
         merged4.select(channel='H')[0].data,
-        [1, 1, 2, 2, 1, 1])
+        [1, 2, 2, 2, 1, 1])
-- 
GitLab