Fixed two bugs:

+ tests/searchcommands are now executable
+ tests/searchcommands/test_search_command responds to new error handling

Signed-off-by: David Noble <dnoble@splunk.com>

Author: David Noble

tests/searchcommands/test_decorators.py

@@ -183,4 +183,7 @@ def test_builtin_options(self):
 
         return
 
-    _package_directory = os.path.dirname(__file__)
+    _package_directory = os.path.dirname(__file__)
+
+if __name__ == "__main__":
+    unittest.main()

tests/searchcommands/test_examples.py

@@ -54,12 +54,18 @@ def test_process(self):
         # We support dynamic configuration, not static
 
         expected = \
-            'error_message=Command search appears to be statically configured and static configuration is unsupported by splunklib.searchcommands. Please ensure that default/commands.conf contains this stanza: [search] | filename = foo.py | supports_getinfo = true | supports_rawargs = true | outputheader = true\r\n' \
+            '\r\n' \
+            'ERROR,__mv_ERROR' \
+            '\r\n' \
+            'Command search appears to be statically configured and static configuration is unsupported by splunklib.searchcommands. Please ensure that default/commands.conf contains this stanza: [search] | filename = foo.py | supports_getinfo = true | supports_rawargs = true | outputheader = true,' \
             '\r\n'
 
         command = SearchCommand()
         result = StringIO()
-        command.process(['foo.py'], output_file=result)
+
+        self.assertRaises(
+            SystemExit, command.process, ['foo.py'], output_file=result)
+
         result.reset()
         observed = result.read()
         self.assertEqual(expected, observed)
@@ -88,7 +94,8 @@ def test_process(self):
 
         command = SearchCommand()
         result = StringIO()
-        command.process(['foo.py', '__GETINFO__', 'undefined_option=value'], output_file=result)
+
+        self.assertRaises(SystemExit, command.process, ['foo.py', '__GETINFO__', 'undefined_option=value'], output_file=result)
         result.reset()
         observed = result.read()
         self.assertEqual(expected, observed)
@@ -97,8 +104,9 @@ def test_process(self):
         # errors, if invoked to execute
 
         expected = \
-            'error_message=Unrecognized option: undefined_option = value\r\n' \
-            '\r\n'
+            '\r\n' \
+            'ERROR,__mv_ERROR\r\n' \
+            'Unrecognized option: undefined_option = value,\r\n'
 
         command = SearchCommand()
         result = StringIO()
@@ -118,7 +126,9 @@ def test_process(self):
         # Command.process should exit on processing exceptions
 
         expected = \
-            ''
+            '\r\n' \
+            'ERROR,__mv_ERROR\r\n' \
+            '\'NoneType\' object is not iterable,\r\n'
 
         command = SearchCommand()
         result = StringIO()
@@ -175,4 +185,7 @@ def test_process(self):
 
         return
 
-    _package_directory = os.path.dirname(__file__)
+    _package_directory = os.path.dirname(__file__)
+
+if __name__ == "__main__":
+    unittest.main()

tests/searchcommands/test_search_command.py

@@ -332,4 +332,7 @@ def test_messages_header(self):
 
         return
 
-    _package_path = os.path.dirname(__file__)
+    _package_path = os.path.dirname(__file__)
+
+if __name__ == "__main__":
+    unittest.main()

tests/searchcommands/test_search_command_internals.py

@@ -96,3 +96,6 @@ def test_file(self):
             self.assertRaises(ValueError, validator, path)
 
         return
+
+if __name__ == "__main__":
+    unittest.main()