One more test improvement

David Noble · David Noble · commit ae268997d9f3 · 2013-12-22T18:21:24.000-08:00
diff --git a/tests/searchcommands_data/_expected_results/test_reporting_command_configuration.txt b/tests/searchcommands_data/_expected_results/test_reporting_command_configuration.txt
@@ -14,6 +14,6 @@ retainsevents = False
 run_in_preview = True
 stderr_dest = log
 streaming = False
-streaming_preop = stubbedreporting __map__ boolean=false duration=10 fieldname="foo" file="/Users/david-noble/Workspace/Splunk/splunk-sdk-python/tests/searchcommands_data/input/counts.csv" integer=10 optionname="foo_bar" regularexpression="\\w+" set="foo"
+streaming_preop = stubbedreporting __map__ boolean=false duration=10 fieldname="foo" file={file} integer=10 optionname="foo_bar" regularexpression="\\w+" set="foo"
 supports_multivalues = True
 supports_rawargs = True
diff --git a/tests/test_searchcommands_app.py b/tests/test_searchcommands_app.py
@@ -421,18 +421,17 @@ def test_streaming_command_on_server(self):
     def _assertCorrectConfiguration(self, command, test_name):
         expected_file_location = os.path.join('_expected_results', test_name + '.txt')
         output_file_location = os.path.join('output', test_name + '.csv')
+        file_path = JSONEncoder().encode(TestSearchCommandsApp._data_file(os.path.join('input', 'counts.csv')))
         with TestSearchCommandsApp._open_data_file(os.path.join('input', '_empty.csv'), 'r') as input_file:
             with TestSearchCommandsApp._open_data_file(output_file_location, 'w') as output_file:
-                encoder = JSONEncoder()
-                file_path = TestSearchCommandsApp._data_file(os.path.join('input', 'counts.csv'))
                 command.process(
                     [
                         command.name,
                         '__GETINFO__',
                         'boolean=false',
                         'duration=00:00:10',
                         'fieldname=foo',
-                        'file=%s' % encoder.encode(file_path),
+                        'file=%s' % file_path,
                         'integer=10',
                         'optionname=foo_bar',
                         'regularexpression="\\\\w+"',
@@ -442,7 +441,7 @@ def _assertCorrectConfiguration(self, command, test_name):
                     output_file)
         actual = str(command.configuration)
         with TestSearchCommandsApp._open_data_file(expected_file_location, 'r') as input_file:
-            expected = ''.join(input_file.readlines())
+            expected = ''.join(input_file.readlines()).replace("{file}", file_path)
         self.assertMultiLineEqual(expected, actual)
 
     def _assertCorrectOutputFile(self, name):
