Changeset 5842


Ignore:
Timestamp:
Jun 4, 2012 4:39:38 PM (7 years ago)
Author:
jwatson
Message:

Adding alternative baseline for PySP test - encountered when moving some tests to carr.sandia.gov.

Location:
coopr.pysp/trunk/coopr/pysp/tests/unit
Files:
1 added
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • coopr.pysp/trunk/coopr/pysp/tests/unit/test_ph.py

    r5838 r5842  
    12971297            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.out",this_test_file_directory+"sizes3_linearized_cplex_with_phpyro_darwin.baseline", filter=filter_pyro)       
    12981298        else:
    1299             self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.out",this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.baseline", filter=filter_pyro)       
     1299            [flag_a,lineno_a,diffs_a] = pyutilib.misc.compare_file(this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.out", this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.baseline-a", filter=filter_pyro)
     1300            [flag_b,lineno_b,diffs_b] = pyutilib.misc.compare_file(this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.out", this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.baseline-b", filter=filter_pyro)
     1301            if (not flag_a) and (not flag_b):
     1302                self.fail("Differences identified relative to all baseline output file alternatives")               
    13001303
    13011304    @unittest.skipIf(not gurobi_available or not mpirun_available, "Either the 'gurobi' executable is not available or the 'mpirun' executable is not available")
Note: See TracChangeset for help on using the changeset viewer.