Changeset 54ac968 in nscp for scripts/python

Timestamp:

08/10/11 15:05:59 (22 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

afd42f1

Parents:

04ef932

Message:

2011-08-10

• Fixed linus issues and defect
• Fixed some issues in the test python script regarding how prefix is handled
• Fixed PythonScript module to actually use the correct function map :)

File:

• scripts/python/test.py (modified) (2 diffs)

scripts/python/test.py

@@ -3 +3 @@
 core = Core.get()
 
+prefix = 'py_'
 def test(arguments):
   log('inside test')
   for a in arguments:
     log('Got argument: %s'%a)
-  (retcode, msg, perf) = core.simple_query("normal", [])
+  (retcode, msg, perf) = core.simple_query("%snormal"%prefix, [])
   if msg != "ok got: ":
     return (status.CRITICAL, "Test failed")
-  (retcode, msg, perf) = core.simple_query("normal", ["hello"])
+  (retcode, msg, perf) = core.simple_query("%snormal"%prefix, ["hello"])
   if msg != "ok got: hello":
     return (status.CRITICAL, "Test failed")
-  (retcode, msg, perf) = core.simple_query("normal", ["hello", "world"])
+  (retcode, msg, perf) = core.simple_query("%snormal"%prefix, ["hello", "world"])
   if perf != "'args'=2":
     return (status.CRITICAL, "Test failed: -%s-"%perf)
@@ -44 +45 @@
   
 def init(alias):
-  prefix = 'py_'
   if alias:
     prefix = '%s_'%alias