Fixing some syntax problems with the rpt unit tests

Author: renierm

rpt/__init__.py

@@ -20,6 +20,7 @@
 
 # Import all test cases found and add to a test suite for running.
 suite = unittest.TestSuite()
+test_files.sort()
 for t in test_files:
 	test = __import__(t[:-3]) # remove '.py' ending for import call
 	suite.addTest(test.TestSequence())

rpt/rpt_utils_000.py

@@ -29,13 +29,13 @@ class TestSequence(unittest.TestCase):
     """
     def runTest(self):
 
-        rpttable = RPTable()
+        rptable = RPTable()
 
-        oh_init_rpt(rpttable)
+        oh_init_rpt(rptable)
 
-        self.assertEqual(oh_add_resource(rpttable, rptentries[0], None, 0), 0)
+        self.assertEqual(oh_add_resource(rptable, rptentries[0], None, 0), 0)
 
-        tmpentry = oh_get_resource_by_id(rpttable, rptentries[0].ResourceId)
+        tmpentry = oh_get_resource_by_id(rptable, rptentries[0].ResourceId)
 
         self.assertEqual(tmpentry != None, True)
 

rpt/rpt_utils_001.py

@@ -15,7 +15,7 @@
 from types import *
 import unittest
 from openhpi import *
-import r
+from rpt_resources import rptentries, objcmp
 
 class TestSequence(unittest.TestCase):
 
@@ -30,17 +30,17 @@ class TestSequence(unittest.TestCase):
     """
     def runTest(self):
 
-        rpttable = RPTable()
+        rptable = RPTable()
 
-        oh_init_rpt(rpttable)
+        oh_init_rpt(rptable)
 
-        self.assertEqual(oh_add_resource(rpttable, r.rptentries[0], None, 0), 0)
+        self.assertEqual(oh_add_resource(rptable, rptentries[0], None, 0), 0)
 
-        tmpentry = oh_get_resource_by_ep(rpttable, (r.rptentries[0].ResourceEntity))
+        tmpentry = oh_get_resource_by_ep(rptable, (rptentries[0].ResourceEntity))
 
         self.assertEqual(tmpentry != None, True)
 
-        self.assertEqual(r.objcmp(r.rptentries[0], tmpentry), True)
+        self.assertEqual(objcmp(rptentries[0], tmpentry), True)
 
 if __name__=='__main__':
         unittest.main()        

rpt/rpt_utils_002.py

@@ -15,7 +15,7 @@
 from types import *
 import unittest
 from openhpi import *
-import r
+from rpt_resources import rptentries, objcmp
 
 
 class TestSequence(unittest.TestCase):
@@ -38,15 +38,15 @@ def runTest(self):
 
         res_data_len = len(res_data)
 
-        oh_init_rpt(rpttable)
+        oh_init_rpt(rptable)
 
-        self.assertEqual(oh_add_resource(rptable, r.rptentries[0], None, 0), 0)
+        self.assertEqual(oh_add_resource(rptable, rptentries[0], None, 0), 0)
 
-        data = oh_get_resource_data(rpttable, r.rptentries[0].ResourceId)
+        data = oh_get_resource_data(rptable, rptentries[0].ResourceId)
 
         self.assertEqual(not (data), True)
 
-        self.assertEqual(r.objcmp(data, res_data) and r.objcmp(res_data,res_data_len), False)
+        self.assertEqual(objcmp(data, res_data) and objcmp(res_data,res_data_len), False)
 
 
 if __name__=='__main__':

rpt/rpt_utils_003.py

@@ -17,7 +17,7 @@
 from types import *
 import unittest
 from openhpi import *
-import r
+from rpt_resources import rptentries, objcmp
 from random import *
 
 class TestSequence(unittest.TestCase):
@@ -40,8 +40,8 @@ def runTest(self):
         k=0
 
         while i<10:
-                self.assertEqual(oh_add_resource(rptable, r.rptentries[i], None, 0), 0)
-                resources.append(r.rptentries[i])
+                self.assertEqual(oh_add_resource(rptable, rptentries[i], None, 0), 0)
+                resources.append(rptentries[i])
                 i=i+1
 
         j=i
@@ -56,7 +56,7 @@ def runTest(self):
 
                 tmpentry = oh_get_resource_by_id(rptable, randentry.ResourceId)
                 self.assertEqual(not (tmpentry), 0)   
-                self.assertEqual((r.objcmp(randentry, tmpentry) and r.objcmp(tmpentry, SaHpiRptEntryT)), 0)    
+                self.assertEqual((objcmp(randentry, tmpentry) and objcmp(tmpentry, SaHpiRptEntryT)), 0)    
                 resources.remove(tmpnode)
                 i=i-1
 

rpt/rpt_utils_004.py

@@ -17,7 +17,7 @@
 from types import *
 import unittest
 from openhpi import *
-import r
+from rpt_resources import rptentries, objcmp
 from random import *
 
 class TestSequence(unittest.TestCase):
@@ -42,8 +42,8 @@ def runTest(self):
         k=0
 
         while i<10:
-                self.assertEqual(oh_add_resource(rptable, r.rptentries[i], None, 0), 0)
-                resources.append(r.rptentries[i])
+                self.assertEqual(oh_add_resource(rptable, rptentries[i], None, 0), 0)
+                resources.append(rptentries[i])
                 i=i+1
 
 
@@ -59,7 +59,7 @@ def runTest(self):
                 tmpentry = oh_get_resource_by_ep(rptable, randentry.ResourceEntity)
 
                 self.assertEqual(not (tmpentry), 0)   
-                self.assertEqual((r.objcmp(randentry, tmpentry) and r.objcmp(tmpentry, SaHpiRptEntryT)), 0)    
+                self.assertEqual((objcmp(randentry, tmpentry) and objcmp(tmpentry, SaHpiRptEntryT)), 0)    
                 resources.remove(randentry)
                 i=i-1
 

rpt/rpt_utils_020.py

@@ -16,7 +16,7 @@
 
 from types import *
 import unittest
-from openhpi import * rptentries
+from openhpi import *
 from rpt_resources import sensors
 
 from random import *