[Omc-commit] SF.net SVN: omc:[1124] cmpi-bindings/trunk/test/python

[<ba...@us...>]

Revision: 1124
          http://omc.svn.sourceforge.net/omc/?rev=1124&view=rev
Author:   bartw
Date:     2008-10-23 15:36:36 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
tailor test depending on broker

Modified Paths:
--------------
    cmpi-bindings/trunk/test/python/TestMethod.mof
    cmpi-bindings/trunk/test/python/TestMethod.py
    cmpi-bindings/trunk/test/python/TestMethod_Test.py

Modified: cmpi-bindings/trunk/test/python/TestMethod.mof
===================================================================
--- cmpi-bindings/trunk/test/python/TestMethod.mof	2008-10-23 15:34:41 UTC (rev 1123)
+++ cmpi-bindings/trunk/test/python/TestMethod.mof	2008-10-23 15:36:36 UTC (rev 1124)
@@ -270,5 +270,8 @@
 	sint32 getObjects(
 			[in(false), out, required, EmbeddedInstance("Test_Method")] string insts[]
 	); 
+
+    [ Description("Get the name of the broker"), Static ]
+	string getBrokerName(); 
 };
 

Modified: cmpi-bindings/trunk/test/python/TestMethod.py
===================================================================
--- cmpi-bindings/trunk/test/python/TestMethod.py	2008-10-23 15:34:41 UTC (rev 1123)
+++ cmpi-bindings/trunk/test/python/TestMethod.py	2008-10-23 15:36:36 UTC (rev 1124)
@@ -754,6 +754,15 @@
         out_params = [pywbem.CIMParameter('insts', 'instance', value=insts)]
         rval = pywbem.Sint32(0)
         return (rval, out_params)
+
+    def cim_method_getbrokername(self, env, object_name):
+        logger = env.get_logger()
+        logger.log_debug('Entering %s.cim_method_getbrokername()' \
+                % self.__class__.__name__)
+
+        out_params = []
+        rval = env.get_cimom_handle().broker.name()
+        return (rval, out_params)
         
 ## end of class TestMethodProvider
 

Modified: cmpi-bindings/trunk/test/python/TestMethod_Test.py
===================================================================
--- cmpi-bindings/trunk/test/python/TestMethod_Test.py	2008-10-23 15:34:41 UTC (rev 1123)
+++ cmpi-bindings/trunk/test/python/TestMethod_Test.py	2008-10-23 15:36:36 UTC (rev 1124)
@@ -520,6 +520,11 @@
 
 
     def test_xembeddedinst_output_params(self):
+        rv,outs = self.conn.InvokeMethod('getBrokerName', 'Test_Method')
+        if rv == 'RequestHandler':
+            print '\n*** Broker detected as SFCB.  Skipping embedded out param test.'
+            print 'Re-enable when SFCB is fixed.' 
+            return
         iname = pywbem.CIMInstanceName('Test_Method', namespace='root/cimv2',
                 keybindings = {'id':'one'})
         inst = pywbem.CIMInstance('Test_Method', path=None, 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.