Changeset 2435
- Timestamp:
- Mar 12, 2010 3:43:28 AM (11 years ago)
- Location:
- coopr.opt/stable/2.3
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
coopr.opt/stable/2.3
- Property svnmerge-integrated changed
/coopr.opt/trunk merged: 2420
- Property svnmerge-integrated changed
-
coopr.opt/stable/2.3/coopr/opt/tests/base/test_convert.py
r2201 r2435 12 12 13 13 import re 14 import unittest15 14 from nose.tools import nottest 16 15 import coopr.opt 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.component.config … … 69 68 70 69 71 class OptConvertDebug( pyutilib.th.TestCase):70 class OptConvertDebug(unittest.TestCase): 72 71 73 72 def setUp(self): -
coopr.opt/stable/2.3/coopr/opt/tests/base/test_os.py
r1918 r2435 11 11 currdir = dirname(abspath(__file__))+os.sep 12 12 13 import unittest14 13 from nose.tools import nottest 15 14 import coopr.opt 16 15 import coopr 17 16 import xml 18 import pyutilib.th 17 import pyutilib.th as unittest 19 18 import pyutilib.services 20 19 21 20 pyutilib.services.TempfileManager.tempdir = currdir 22 21 23 class Test( pyutilib.th.TestCase):22 class Test(unittest.TestCase): 24 23 25 24 def setUp(self): -
coopr.opt/stable/2.3/coopr/opt/tests/base/test_sol.py
r1918 r2435 11 11 currdir = dirname(abspath(__file__))+os.sep 12 12 13 import unittest14 13 from nose.tools import nottest 15 14 import coopr.opt 16 15 import coopr 17 16 import xml 18 import pyutilib.th 17 import pyutilib.th as unittest 19 18 import pyutilib.services 20 19 21 20 22 class Test( pyutilib.th.TestCase):21 class Test(unittest.TestCase): 23 22 24 23 def setUp(self): -
coopr.opt/stable/2.3/coopr/opt/tests/base/test_soln.py
r2109 r2435 11 11 currdir = dirname(abspath(__file__))+os.sep 12 12 13 import unittest14 13 from nose.tools import nottest 15 14 import coopr.opt 16 15 import coopr 17 import pyutilib.th 16 import pyutilib.th as unittest 18 17 import pyutilib.misc 19 18 import pyutilib.services … … 28 27 29 28 30 class Test( pyutilib.th.TestCase):29 class Test(unittest.TestCase): 31 30 32 31 def setUp(self): … … 56 55 self.failUnlessFileEqualsBaseline(currdir+"write_solution2.txt", currdir+"test2_soln.txt") 57 56 57 @unittest.skipIf(not yaml_available, "Cannot import 'yaml'") 58 58 def test_read_solution1(self): 59 59 """ Read a SolverResults Object""" 60 if not yaml_available:61 return62 60 self.results = coopr.opt.SolverResults() 63 61 self.results.read(filename=currdir+"test4_sol.txt") … … 67 65 self.failUnlessFileEqualsBaseline(currdir+"read_solution1.out", currdir+"test4_sol.txt") 68 66 67 @unittest.skipIf(not yaml_available, "Cannot import 'yaml'") 69 68 def test_pickle_solution1(self): 70 69 """ Read a SolverResults Object""" 71 if not yaml_available:72 return73 70 self.results = coopr.opt.SolverResults() 74 71 self.results.read(filename=currdir+"test4_sol.txt")
Note: See TracChangeset
for help on using the changeset viewer.