Changeset 2431


Ignore:
Timestamp:
Mar 12, 2010 3:41:45 AM (9 years ago)
Author:
wehart
Message:

Merged revisions 2353-2430 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.colin/trunk

........

r2419 | wehart | 2010-03-11 16:01:06 -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.colin/stable/2.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • coopr.colin/stable/2.3

  • coopr.colin/stable/2.3/coopr/colin/tests/core/test_parallel.py

    r2201 r2431  
    1212currdir = dirname(abspath(__file__))+os.sep
    1313
    14 import unittest
    1514from nose.tools import nottest
    1615import xml
     
    1817import coopr.colin
    1918from coopr.opt import ResultsFormat, ProblemFormat
    20 import pyutilib.th
     19import pyutilib.th as unittest
    2120import pyutilib.component.core
    2221import pyutilib.services
     
    106105
    107106
    108 class Test(pyutilib.th.TestCase):
     107class Test(unittest.TestCase):
    109108
    110109
  • coopr.colin/stable/2.3/coopr/colin/tests/core/test_problem.py

    r2183 r2431  
    1212currdir = dirname(abspath(__file__))+os.sep
    1313
    14 import unittest
    1514from nose.tools import nottest
    1615import coopr.colin
     
    1817from coopr.opt import ResultsFormat, ProblemFormat
    1918import pyutilib.services
    20 import pyutilib.th
     19import pyutilib.th as unittest
    2120
    2221
     
    3635
    3736
    38 class TestColinProblem(pyutilib.th.TestCase):
     37class TestColinProblem(unittest.TestCase):
    3938
    4039    def setUp(self):
  • coopr.colin/stable/2.3/coopr/colin/tests/core/test_ps.py

    r2183 r2431  
    1212currdir = dirname(abspath(__file__))+os.sep
    1313
    14 import unittest
    1514from nose.tools import nottest
    1615import xml
     
    1817from coopr.opt import ResultsFormat, ProblemFormat
    1918import pyutilib.services
    20 import pyutilib.th
     19import pyutilib.th as unittest
    2120
    2221
     
    3635
    3736
    38 class OptPatternSearchDebug(pyutilib.th.TestCase):
     37class OptPatternSearchDebug(unittest.TestCase):
    3938
    4039    def setUp(self):
Note: See TracChangeset for help on using the changeset viewer.