Merge pull request #146 from likel/develop

Fix 'maxresultrows' extraction bug

Author: shakeelmohamed

splunklib/searchcommands/search_command.py

@@ -684,7 +684,7 @@ def _process_protocol_v2(self, argv, ifile, ofile):
         # Write search command configuration for consumption by splunkd
         # noinspection PyBroadException
         try:
-            self._record_writer = RecordWriterV2(ofile, getattr(self._metadata, 'maxresultrows', None))
+            self._record_writer = RecordWriterV2(ofile, getattr(self._metadata.searchinfo, 'maxresultrows', None))
             self.fieldnames = []
             self.options.reset()
 

tests/searchcommands/test_search_command.py

@@ -378,7 +378,9 @@ def test_process_scpv2(self):
                         '"show_configuration={show_configuration}",'
                         '"required_option_1=value_1",'
                         '"required_option_2=value_2"'
-                    ']'
+                    '],'
+                    '"maxresultrows": 10,'
+                    '"command": "countmatches"'
                 '}}'
             '}}')
 
@@ -472,6 +474,8 @@ def test_process_scpv2(self):
         self.assertEqual(command_metadata.searchinfo.splunk_version, '20150522')
         self.assertEqual(command_metadata.searchinfo.splunkd_uri, 'https://127.0.0.1:8089')
         self.assertEqual(command_metadata.searchinfo.username, 'admin')
+        self.assertEqual(command_metadata.searchinfo.maxresultrows, 10)
+        self.assertEqual(command_metadata.searchinfo.command, 'countmatches')
 
         command.search_results_info.search_metrics = command.search_results_info.search_metrics.__dict__
         command.search_results_info.optional_fields_json = command.search_results_info.optional_fields_json.__dict__