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

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

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

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

Modified Paths:
--------------
    cmpi-bindings/trunk/test/python/UpcallAtom.mof
    cmpi-bindings/trunk/test/python/UpcallAtomProvider.py
    cmpi-bindings/trunk/test/python/UpcallAtomTest.py

Modified: cmpi-bindings/trunk/test/python/UpcallAtom.mof
===================================================================
--- cmpi-bindings/trunk/test/python/UpcallAtom.mof	2008-10-23 15:32:54 UTC (rev 1122)
+++ cmpi-bindings/trunk/test/python/UpcallAtom.mof	2008-10-23 15:34:41 UTC (rev 1123)
@@ -20,6 +20,9 @@
     uint16 get_indication_send_count(
     // return number of indications sent since last reset
     );
+
+    [ Description("Get the name of the broker"), Static ]
+	string getBrokerName(); 
 };
 
 

Modified: cmpi-bindings/trunk/test/python/UpcallAtomProvider.py
===================================================================
--- cmpi-bindings/trunk/test/python/UpcallAtomProvider.py	2008-10-23 15:32:54 UTC (rev 1122)
+++ cmpi-bindings/trunk/test/python/UpcallAtomProvider.py	2008-10-23 15:34:41 UTC (rev 1123)
@@ -853,7 +853,16 @@
         rval = pywbem.Uint16(cur_ind_count) 
         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 UpcallAtomProvider
 
 

Modified: cmpi-bindings/trunk/test/python/UpcallAtomTest.py
===================================================================
--- cmpi-bindings/trunk/test/python/UpcallAtomTest.py	2008-10-23 15:32:54 UTC (rev 1122)
+++ cmpi-bindings/trunk/test/python/UpcallAtomTest.py	2008-10-23 15:34:41 UTC (rev 1123)
@@ -49,6 +49,11 @@
                 print('')
 
     def test_a_upcalls_all(self):
+        rv,outs = self.conn.InvokeMethod('getBrokerName', 'Test_UpcallAtom')
+        if rv == 'Pegasus':
+            print '\n*** Broker detected as Pegasus.  Skipping upcall test.'
+            print 'Re-enable when Pegasus is fixed.' 
+            return
         rv,outs = self.conn.InvokeMethod('test_all_upcalls', 'Test_UpcallAtom')
         self.assertEquals(rv, 'Success!')
         self.assertFalse(outs)


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