Changeset 3700


Ignore:
Timestamp:
Feb 22, 2011 6:46:57 PM (9 years ago)
Author:
jdsiiro
Message:

Updating test filter to track new results output.

File:
1 edited

Legend:

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

    r3695 r3700  
    9292        self.pyomo('pmedian2.py pmedian.dat', root=currdir+'test5')
    9393        def filter(line):
    94             return line.endswith(']')
     94            return line.startswith("Writingmodel") or line.startswith("Solverresultsfile") or \
     95                   line.endswith(']')
    9596        self.failUnlessFileEqualsBaseline(currdir+"test5.out", currdir+"test5.txt", filter=filter)
    9697        os.remove(currdir+'test5.yml')
     
    122123        """Run pyomo with --verbose option"""
    123124        def filter(line):
    124             return line.startswith("Writing") | line.startswith('DEBUG:') | line.startswith('INFO:') | line.endswith(']')
     125            return line.startswith("Writingmodel") or line.startswith("Solverresultsfile") or \
     126                   line.startswith('DEBUG:') or line.startswith('INFO:') or \
     127                   line.endswith(']')
    125128        self.pyomo('-v pmedian.py pmedian.dat', root=currdir+'test10')
    126129        self.failUnlessFileEqualsBaseline(currdir+"test10.out", currdir+"test10.txt", filter)
Note: See TracChangeset for help on using the changeset viewer.