Merge pull request hpcugent#69 from itkovian/fix-exit-cli

Fix the argument order and add a test

Author: wdpypere

lib/vsc/utils/script_tools.py

@@ -285,20 +285,20 @@ def warning(self, msg):
         """
         Convenience method that calls ExtendedSimpleOptions warning and exists with nagios warning exitcode
         """
-        exit_from_errorcode(msg, 1)
+        exit_from_errorcode(1, msg)
 
     def critical(self, msg):
         """
         Convenience method that calls ExtendedSimpleOptions critical and exists with nagios critical exitcode
         """
-        exit_from_errorcode(msg, 2)
+        exit_from_errorcode(2, msg)
 
     def critical_exception(self, msg, exception):
         """
         Convenience method: report exception and critical method
         """
         logging.exception("%s: %s", msg, exception)
-        exit_from_errorcode(msg, 2)
+        exit_from_errorcode(2, msg)
 
     def do(self, dry_run):  #pylint: disable=unused-argument
         """

setup.py

@@ -55,7 +55,7 @@
 
 
 PACKAGE = {
-    'version': '2.1.1',
+    'version': '2.1.2',
     'author': [ag, sdw],
     'maintainer': [ag, sdw],
     'excluded_pkgs_rpm': ['vsc', 'vsc.utils'],  # vsc is default, vsc.utils is provided by vsc-base

test/script_tools.py

@@ -34,9 +34,9 @@
 import sys
 
 from vsc.install.testing import TestCase
+from vsc.utils.nagios import NAGIOS_EXIT_WARNING
 from vsc.utils.script_tools import ExtendedSimpleOption, DEFAULT_OPTIONS, CLI
 
-
 class TestExtendedSimpleOption(TestCase):
     """
     Tests for the ExtendedSimpleOption class.
@@ -146,3 +146,14 @@ def test_opts(self, prol):
         logging.debug("options wo default sync options %s", ms.options)
         self.assertEqual(ms.options.__dict__, myopts)
 
+    @mock.patch('vsc.utils.script_tools.ExtendedSimpleOption.prologue')
+    def test_exit(self, mock_prologue):
+
+        cli = MyCLI()
+
+        fake_exit = mock.MagicMock()
+        with mock.patch('vsc.utils.nagios._real_exit', fake_exit):
+            cli.warning("be warned")
+            fake_exit.assert_called_with("be warned", NAGIOS_EXIT_WARNING)
+
+