Fix last two unit tests

Shindora · Aug 16, 2017 · 2821621 · 2821621
1 parent 0cfa7de
commit 2821621
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/tests/searchcommands/recordings/scpv2/Splunk-6.3/countmatches.output b/tests/searchcommands/recordings/scpv2/Splunk-6.3/countmatches.output
@@ -1,5 +1,5 @@
-chunked 1.0,19,0
-{"type":"stateful"}
+chunked 1.0,20,0
+{"type":"streaming"}
 chunked 1.0,17,49651
 {"finished":true}_serial,__mv__serial,_time,__mv__time,text,__mv_text,word_count,__mv_word_count
 0,,1380899494,,excellent review my friend loved it yours always guppyman @GGreeny62... http://t.co/fcvq7NDHxl,,14,

diff --git a/tests/searchcommands/recordings/scpv2/Splunk-6.3/sum.map.output b/tests/searchcommands/recordings/scpv2/Splunk-6.3/sum.map.output
@@ -1,5 +1,5 @@
-chunked 1.0,19,0
-{"type":"stateful"}
+chunked 1.0,20,0
+{"type":"streaming"}
 chunked 1.0,17,34
 {"finished":true}total,__mv_total
 2147943.07811,

diff --git a/tests/searchcommands/test_configuration_settings.py b/tests/searchcommands/test_configuration_settings.py
@@ -77,7 +77,7 @@ def generate(self):
 
         self.assertEqual(
             [(name, value) for name, value in command.configuration.iteritems()],
-            [('generating', True), ('type', 'stateful')])
+            [('generating', True), ('type', 'streaming')])
 
         self.assertIs(command.configuration.distributed, False)
         self.assertIs(command.configuration.generating, True)

diff --git a/tests/searchcommands/test_searchcommands_app.py b/tests/searchcommands/test_searchcommands_app.py
@@ -265,6 +265,9 @@ def assertInfoEqual(self, output, expected):
 
     def _compare_chunks(self, expected, output, time_sensitive=True):
 
+        expected = expected.strip()
+        output = output.strip()
+
         if time_sensitive:
             self.assertEqual(len(expected), len(output))
             compare_csv_files = self._compare_csv_files_time_sensitive
@@ -363,7 +366,6 @@ def _load_chunks(self, ifile):
         while True:
 
             line = ifile.readline()
-            line = line.strip()
 
             if len(line) == 0:
                 break