Changeset 2430


Ignore:
Timestamp:
Mar 12, 2010 1:38:22 AM (9 years ago)
Author:
wehart
Message:

Reworking class decorators.

Location:
coopr.pyomo/trunk/coopr/pyomo/tests
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • coopr.pyomo/trunk/coopr/pyomo/tests/examples/test_pyomo.py

    r2422 r2430  
    2424
    2525
    26 @unittest.skipIf(pyutilib.services.registered_executable("glpsol") is None, "The 'glpsol' executable is not available")
    2726class Test(unittest.TestCase):
    2827
     
    107106        os.remove(currdir+'test12.out')
    108107
     108Test = unittest.skipIf(pyutilib.services.registered_executable("glpsol") is None, "The 'glpsol' executable is not available")(Test)
    109109
    110110if __name__ == "__main__":
  • coopr.pyomo/trunk/coopr/pyomo/tests/unit/test_concrete.py

    r2422 r2430  
    1414import pyutilib.services
    1515
    16 @unittest.skipIf(not pyutilib.services.registered_executable("glpsol"), "The 'glpsol' executable is not available")
    1716class Test(unittest.TestCase):
    1817
     
    4039        self.failUnlessFileEqualsBaseline(currdir+"blend.out",currdir+"blend.txt")
    4140
     41Test = unittest.skipIf(not pyutilib.services.registered_executable("glpsol"), "The 'glpsol' executable is not available")(Test)
    4242
    4343if __name__ == "__main__":
  • coopr.pyomo/trunk/coopr/pyomo/tests/unit/test_modeldata.py

    r2422 r2430  
    2525
    2626
    27 @unittest.skipIf(not _win32com, "Cannot import 'win32com'")
    2827class PyomoTableData(unittest.TestCase):
    2928
     
    156155            pass
    157156
     157PyomoTableData = unittest.skipIf(not _win32com, "Cannot import 'win32com'")(PyomoTableData)
    158158
    159159class PyomoModelData(unittest.TestCase):
     
    713713
    714714
    715 @unittest.skipIf(not _win32com, "Cannot import 'win32com'")
    716715class TestSpreadsheet(unittest.TestCase):
    717716
     
    931930        os.remove(currdir+'importPO.dat')
    932931
     932TestSpreadsheet = unittest.skipIf(not _win32com, "Cannot import 'win32com'")(TestSpreadsheet)
     933
    933934
    934935class TestModelData(unittest.TestCase):
Note: See TracChangeset for help on using the changeset viewer.