Reset python helper functions to make them work again

pynest/nest/lib/hl_api_helper.py

@@ -235,11 +235,11 @@ def stack_checker_func(*args, **kwargs):
         if not get_debug():
             return f(*args, **kwargs)
         else:
-            sr
-            stackload_before = spp
+            sr('count')
+            stackload_before = spp()
             result = f(*args, **kwargs)
-            sr
-            num_leftover_elements = spp - stackload_before
+            sr('count')
+            num_leftover_elements = spp() - stackload_before
             if num_leftover_elements != 0:
                 eargs = (f.__name__, num_leftover_elements)
                 etext = "Function '%s' left %i elements on the stack."
@@ -547,8 +547,8 @@ def get_verbosity():
 
     # Defined in hl_api_helper to avoid circular inclusion problem with
     # hl_api_info.py
-    sr
-    return spp
+    sr('verbosity')
+    return spp()
 
 
 @check_stack
@@ -564,7 +564,7 @@ def set_verbosity(level):
 
     # Defined in hl_api_helper to avoid circular inclusion problem with
     # hl_api_info.py
-    sr
+    sr("%s setverbosity" % level)
 
 
 def model_deprecation_warning(model):

pynest/nest/tests/test_helper_functions.py

@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+#
+# test_helper_functions.py
+#
+# This file is part of NEST.
+#
+# Copyright (C) 2004 The NEST Initiative
+#
+# NEST is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# NEST is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with NEST.  If not, see <http://www.gnu.org/licenses/>.
+
+import unittest
+import nest
+
+
+class TestHelperFunctions(unittest.TestCase):
+
+    def test_get_verbosity(self):
+        verbosity = nest.get_verbosity()
+        self.assertTrue(isinstance(verbosity, int))
+
+    def test_set_verbosity(self):
+        levels = [('M_ALL', 0),
+                  ('M_DEBUG', 5),
+                  ('M_STATUS', 7),
+                  ('M_INFO', 10),
+                  ('M_DEPRECATED', 18),
+                  ('M_WARNING', 20),
+                  ('M_ERROR', 30),
+                  ('M_FATAL', 40),
+                  ('M_QUIET', 100)
+                  ]
+        for level, code in levels:
+            nest.set_verbosity(level)
+            verbosity = nest.get_verbosity()
+            self.assertEqual(verbosity, code)
+
+    def test_stack_checker(self):
+        def empty_stack():
+            nest.sli_run('clear')
+
+        def leave_on_stack():
+            nest.sli_push(1)
+
+        check_empty_stack = nest.stack_checker(empty_stack)
+        check_leave_on_stack = nest.stack_checker(leave_on_stack)
+
+        debug = nest.get_debug()
+        # We have to set debug to True to check the stack
+        nest.set_debug(True)
+
+        # This should pass without errors
+        check_empty_stack()
+
+        try:
+            self.assertRaises(nest.NESTError, check_leave_on_stack)
+        except:  # Ensure that debug is reset if we get an error.
+            nest.set_debug(debug)
+            raise
+        nest.set_debug(debug)
+
+
+def suite():
+    suite = unittest.makeSuite(TestHelperFunctions, 'test')
+    return suite
+
+
+if __name__ == "__main__":
+    runner = unittest.TextTestRunner(verbosity=2)
+    runner.run(suite())