Changeset 2432
- Timestamp:
- Mar 12, 2010 3:42:15 AM (11 years ago)
- Location:
- coopr.plugins/stable/2.3
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
coopr.plugins/stable/2.3
- Property svnmerge-integrated changed
/coopr.plugins/trunk merged: 2421,2429
- Property svnmerge-integrated changed
-
coopr.plugins/stable/2.3/coopr/plugins/tests/mip/test_asl.py
r2314 r2432 11 11 currdir = dirname(abspath(__file__))+os.sep 12 12 13 import unittest14 13 from nose.tools import nottest 15 import pyutilib.th 14 import pyutilib.th as unittest 16 15 import pyutilib.services 17 16 import pyutilib.common … … 36 35 37 36 38 class mock_all( pyutilib.th.TestCase):37 class mock_all(unittest.TestCase): 39 38 40 39 def setUp(self): … … 157 156 class mip_all(mock_all): 158 157 159 def run(self, result=None):160 global cplexamp_available161 if not cplexamp_available:162 return163 mock_all.run(self,result)164 165 158 def setUp(self): 166 159 self.do_setup(True) 167 160 161 mip_all = unittest.skipIf(not cplexamp_available, "The 'cplexamp' command is not available")(mip_all) 168 162 169 163 if __name__ == "__main__": -
coopr.plugins/stable/2.3/coopr/plugins/tests/mip/test_cbc.py
r2356 r2432 11 11 currdir = dirname(abspath(__file__))+os.sep 12 12 13 import pyutilib.th 13 import pyutilib.th as unittest 14 14 import pyutilib.common 15 15 import pyutilib.services 16 import unittest17 16 from nose.tools import nottest 18 17 import coopr.plugins.mip … … 38 37 39 38 40 class mock_all( pyutilib.th.TestCase):39 class mock_all(unittest.TestCase): 41 40 42 41 def setUp(self): … … 158 157 class mip_all(mock_all): 159 158 160 def run(self, result=None):161 """162 Run the same tests, but only if CBC is available163 """164 global cbc_available165 if not cbc_available:166 return167 mock_all.run(self,result)168 169 159 def setUp(self): 170 160 self.do_setup(True) … … 178 168 #os.remove(currdir+"test_solve1a.soln") 179 169 170 mip_all = unittest.skipIf(not cbc_available, "The 'cbc' command is not available")(mip_all) 180 171 181 172 if __name__ == "__main__": -
coopr.plugins/stable/2.3/coopr/plugins/tests/mip/test_convert.py
r2314 r2432 12 12 13 13 import re 14 import unittest15 14 from nose.tools import nottest 16 15 import coopr.plugins 17 16 from coopr.opt import ProblemFormat, ConverterError 18 17 import coopr 19 import pyutilib.th 18 import pyutilib.th as unittest 20 19 import pyutilib.services 21 20 import pyutilib.common … … 72 71 73 72 74 class Test( pyutilib.th.TestCase):73 class Test(unittest.TestCase): 75 74 76 75 def setUp(self): -
coopr.plugins/stable/2.3/coopr/plugins/tests/mip/test_cplex.py
r2314 r2432 11 11 currdir = dirname(abspath(__file__))+os.sep 12 12 13 import unittest14 13 from nose.tools import nottest 15 import pyutilib.th 14 import pyutilib.th as unittest 16 15 import pyutilib.services 17 16 import pyutilib.common … … 35 34 36 35 37 class mock_all( pyutilib.th.TestCase):36 class mock_all(unittest.TestCase): 38 37 39 38 def setUp(self): … … 156 155 class mip_all(mock_all): 157 156 158 def run(self, result=None):159 global cplex_available160 if not cplex_available:161 return162 mock_all.run(self,result)163 164 157 def setUp(self): 165 158 self.do_setup(True) 166 159 160 mip_all = unittest.skipIf(not cplex_available, "The CPLEX solver is not available")(mip_all) 167 161 168 162 if __name__ == "__main__": -
coopr.plugins/stable/2.3/coopr/plugins/tests/mip/test_glpk.py
r2390 r2432 11 11 currdir = dirname(abspath(__file__))+os.sep 12 12 13 import pyutilib.th 13 import pyutilib.th as unittest 14 14 import pyutilib.common 15 15 import pyutilib.services 16 import unittest17 16 from nose.tools import nottest 18 17 import coopr.plugins.mip … … 41 40 42 41 43 class mock_all( pyutilib.th.TestCase):42 class mock_all(unittest.TestCase): 44 43 45 44 def setUp(self): … … 167 166 class mip_all(mock_all): 168 167 169 def run(self, result=None):170 """171 Run the same tests, but only if GLPK is available172 """173 global glpk_available174 if not glpk_available:175 return176 mock_all.run(self,result)177 178 168 def setUp(self): 179 169 self.do_setup(True) … … 189 179 os.remove(currdir+"glpk.soln") 190 180 181 mip_all = unittest.skipIf(not glpk_available, "The 'glpsol' command is not available")(mip_all) 191 182 192 183 if __name__ == "__main__": -
coopr.plugins/stable/2.3/coopr/plugins/tests/mip/test_pico.py
r2314 r2432 11 11 currdir = dirname(abspath(__file__))+os.sep 12 12 13 import unittest14 13 from nose.tools import nottest 15 import pyutilib.th 14 import pyutilib.th as unittest 16 15 import pyutilib.common 17 16 import pyutilib.services … … 37 36 38 37 39 class mock_all( pyutilib.th.TestCase):38 class mock_all(unittest.TestCase): 40 39 41 40 def setUp(self): … … 156 155 class mip_all(mock_all): 157 156 158 def run(self, result=None):159 global pico_available160 if not pico_available:161 return162 mock_all.run(self,result)163 164 157 def setUp(self): 165 158 self.do_setup(True) 166 159 160 mip_all = unittest.skipIf(not pico_available, "The PICO solver is not available")(mip_all) 167 161 168 162 if __name__ == "__main__":
Note: See TracChangeset
for help on using the changeset viewer.