Changeset 2435

Timestamp:

Mar 12, 2010 3:43:28 AM (9 years ago)

Author:

wehart

Message:

Merged revisions 2355-2434 via svnmerge from
​https://software.sandia.gov/svn/public/coopr/coopr.opt/trunk

........

r2420 | wehart | 2010-03-11 16:01:07 -0700 (Thu, 11 Mar 2010) | 3 lines

Rework of unit tests to (a) import pyutilib.th as 'unittest' and
(b) employ test skipping.

........

Location:

coopr.opt/stable/2.3

Files:

• . (modified) (1 prop)
• coopr/opt/tests/base/test_convert.py (modified) (2 diffs)
• coopr/opt/tests/base/test_os.py (modified) (1 diff)
• coopr/opt/tests/base/test_sol.py (modified) (1 diff)
• coopr/opt/tests/base/test_soln.py (modified) (4 diffs)

coopr.opt/stable/2.3/coopr/opt/tests/base/test_convert.py

@@ -12 +12 @@
 
 import re
-import unittest
 from nose.tools import nottest
 import coopr.opt
 from coopr.opt import ProblemFormat, ConverterError
 import coopr
-import pyutilib.th
+import pyutilib.th as unittest
 import pyutilib.services
 import pyutilib.component.config
@@ -69 +68 @@
 
 
-class OptConvertDebug(pyutilib.th.TestCase):
+class OptConvertDebug(unittest.TestCase):
 
     def setUp(self):

coopr.opt/stable/2.3/coopr/opt/tests/base/test_os.py

@@ -11 +11 @@
 currdir = dirname(abspath(__file__))+os.sep
 
-import unittest
 from nose.tools import nottest
 import coopr.opt
 import coopr
 import xml
-import pyutilib.th
+import pyutilib.th as unittest
 import pyutilib.services
 
 pyutilib.services.TempfileManager.tempdir = currdir
 
-class Test(pyutilib.th.TestCase):
+class Test(unittest.TestCase):
 
     def setUp(self):

coopr.opt/stable/2.3/coopr/opt/tests/base/test_sol.py

@@ -11 +11 @@
 currdir = dirname(abspath(__file__))+os.sep
 
-import unittest
 from nose.tools import nottest
 import coopr.opt
 import coopr
 import xml
-import pyutilib.th
+import pyutilib.th as unittest
 import pyutilib.services
 
 
-class Test(pyutilib.th.TestCase):
+class Test(unittest.TestCase):
 
     def setUp(self):

coopr.opt/stable/2.3/coopr/opt/tests/base/test_soln.py

@@ -11 +11 @@
 currdir = dirname(abspath(__file__))+os.sep
 
-import unittest
 from nose.tools import nottest
 import coopr.opt
 import coopr
-import pyutilib.th
+import pyutilib.th as unittest
 import pyutilib.misc
 import pyutilib.services
@@ -28 +27 @@
 
 
-class Test(pyutilib.th.TestCase):
+class Test(unittest.TestCase):
 
     def setUp(self):
@@ -56 +55 @@
         self.failUnlessFileEqualsBaseline(currdir+"write_solution2.txt", currdir+"test2_soln.txt")
 
+    @unittest.skipIf(not yaml_available, "Cannot import 'yaml'")
     def test_read_solution1(self):
         """ Read a SolverResults Object"""
-        if not yaml_available:
-            return
         self.results = coopr.opt.SolverResults()
         self.results.read(filename=currdir+"test4_sol.txt")
@@ -67 +65 @@
         self.failUnlessFileEqualsBaseline(currdir+"read_solution1.out", currdir+"test4_sol.txt")
 
+    @unittest.skipIf(not yaml_available, "Cannot import 'yaml'")
     def test_pickle_solution1(self):
         """ Read a SolverResults Object"""
-        if not yaml_available:
-            return
         self.results = coopr.opt.SolverResults()
         self.results.read(filename=currdir+"test4_sol.txt")