Changeset 3581

Timestamp:

10/26/2009 08:22:42 PM (1 month ago)

Author:

brian

Message:

A few fixes to get the unittests working again.

Files:

• gip/trunk/gip/lib/python/gip/batch_systems/pbs.py (modified) (1 diff)
• gip/trunk/gip/lib/python/gip/batch_systems/sge.py (modified) (2 diffs)
• gip/trunk/gip/lib/python/gip/providers/generic_batch_system.py (modified) (1 diff)
• gip/trunk/test/pbs_test.py (modified) (2 diffs)
• gip/trunk/test/test_cluster.py (modified) (1 diff)

gip/trunk/gip/lib/python/gip/batch_systems/pbs.py

@@ -10 +10 @@
-
-from gip_common import HMSToMin, getLogger, VoMapper, voList, parseRvf, \
-
+, cp_get
-from gip_testing import runCommand
-from gip.batch_systems.batch_system import BatchSystem

gip/trunk/gip/lib/python/gip/batch_systems/sge.py

@@ -9 +9 @@
-import gip_sets as sets
-
-
+, cp_get
-from xml_common import parseXmlSax
-from gip.batch_systems.sge_sax_handler import QueueInfoParser, JobInfoParser, \
@@ -435 +435 @@
-        $SGE_ROOT/$SGE_CELL/common/settings.sh
-        """
-
+self.
-        if not sge_root:
-            log.warning("Could not locate sge_root in config file!  Not " \
-                "bootstrapping SGE environment.")
-            return
-
+self.
-        if not sge_cell:
-            log.warning("Could not locate sge_cell in config file!  Not " \

gip/trunk/gip/lib/python/gip/providers/generic_batch_system.py

@@ -85 +85 @@
-            info['free_slots'] = min(info['free_slots'], info['max_queuable'])
-        else:
-
+
+
+
+
-            # free_slots <= max_total
-            info['free_slots'] = min(info['free_slots'], info['max_total'])

gip/trunk/test/pbs_test.py

@@ -172 +172 @@
-                    '-pbs-dzero':
-                self.failUnless(entry.glue['CEPolicyMaxRunningJobs'] == '158')
-
+
+
+
+
-                self.failUnless(entry.glue['CEStateFreeJobSlots'] == '158')
+                self.failUnless(entry.glue['CEPolicyAssignedJobSlots'] == \
+                    '158')
+                self.failUnless(entry.glue['CEInfoTotalCPUs'] == '158')
-                has_dzero_ce = True
-        self.failUnless(has_dzero_ce, msg="dzero queue's CE was not found!")
@@ -217 +223 @@
-                    '-pbs-lcgadmin':
-                self.failUnless(entry.glue['CEPolicyMaxWaitingJobs'] == '183')
-183
-183
+4
+4
-                has_lcgadmin_ce = True
-        self.failUnless(has_lcgadmin_ce, msg="lcgadmin queue's CE was not found!")

gip/trunk/test/test_cluster.py

@@ -10 +10 @@
-from gip_common import config
-from gip_ldap import read_ldap
-
+gip.
-
-class TestCluster(unittest.TestCase):