Changeset 2437


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

Merged revisions 2357-2436 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.sucasa/trunk

........

r2424 | wehart | 2010-03-11 16:01:11 -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.sucasa/stable/2.1
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • coopr.sucasa/stable/2.1

  • coopr.sucasa/stable/2.1/coopr/sucasa/tests/models/test_amplbook2.py

    r1768 r2437  
    33#
    44
    5 import unittest
    65import os
    76import sys
     
    1312from coopr.sucasa import parse_mapfile,MILPSymbInfo,parse_ampl
    1413import pyutilib.misc
    15 import pyutilib.th
     14import pyutilib.th as unittest
    1615import glob
    1716
     
    1918# Test class
    2019#
    21 class TestAmplbook2(pyutilib.th.TestCase): pass
     20class TestAmplbook2(unittest.TestCase): pass
    2221#
    2322# The directory with the test data
  • coopr.sucasa/stable/2.1/coopr/sucasa/tests/unit/test_AmplInfo.py

    r1768 r2437  
    1010currdir = dirname(abspath(__file__))+os.sep
    1111
    12 import unittest
    1312import pyutilib.misc
    14 import pyutilib.th
     13import pyutilib.th as unittest
    1514from nose.tools import nottest
    1615from coopr.sucasa.ampl_info import AmplInfo
    1716from coopr.sucasa.symb_info import MILPSymbInfo
    1817
    19 class AmplInfoTester(pyutilib.th.TestCase):
     18class AmplInfoTester(unittest.TestCase):
    2019
    2120    def setUp(self):
  • coopr.sucasa/stable/2.1/coopr/sucasa/tests/unit/test_parser.py

    r1768 r2437  
    1010currdir = dirname(abspath(__file__))+os.sep
    1111
    12 import unittest
    1312from nose.tools import nottest
    1413from coopr.sucasa import parse_ampl,MILPSymbInfo
    1514import pyutilib.misc
    16 import pyutilib.th
     15import pyutilib.th as unittest
    1716
    1817class ParserTester(pyutilib.th.TestCase):
  • coopr.sucasa/stable/2.1/coopr/sucasa/tests/unit/test_symb_info.py

    r1768 r2437  
    1010currdir = dirname(abspath(__file__))+os.sep
    1111
    12 import unittest
    1312from nose.tools import nottest
    1413from coopr.sucasa import parse_mapfile,MILPSymbInfo
    1514import pyutilib.misc
    16 import pyutilib.th
     15import pyutilib.th as unittest
    1716
    18 class ParseMapFileTester(pyutilib.th.TestCase):
     17class ParseMapFileTester(unittest.TestCase):
    1918
    2019    def setUp(self):
Note: See TracChangeset for help on using the changeset viewer.