Changeset 5790


Ignore:
Timestamp:
May 19, 2012 2:23:30 PM (7 years ago)
Author:
jwatson
Message:

Fixing of some PySP tests, in response to carr migration.

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

Legend:

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

    r5789 r5790  
    710710            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_quadratic_cplex.out",this_test_file_directory+"networkflow1ef10_quadratic_cplex_darwin.baseline", filter=filter_time_and_data_dirs)
    711711        else:
    712             self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_quadratic_cplex.out",this_test_file_directory+"networkflow1ef10_quadratic_cplex.baseline", filter=filter_time_and_data_dirs)
     712            [flag_a,lineno_a,diffs_a] = pyutilib.misc.compare_file(this_test_file_directory+"networkflow1ef10_quadratic_cplex.out", this_test_file_directory+"networkflow1ef10_quadratic_cplex.baseline-a", filter=filter_time_and_data_dirs)
     713            [flag_b,lineno_b,diffs_b] = pyutilib.misc.compare_file(this_test_file_directory+"networkflow1ef10_quadratic_cplex.out", this_test_file_directory+"networkflow1ef10_quadratic_cplex.baseline-b", filter=filter_time_and_data_dirs)
     714            if (not flag_a) and (not flag_b):
     715                self.fail("Differences identified relative to all baseline output file alternatives")               
    713716
    714717    @unittest.skipIf(not gurobi_available, "The 'gurobi' executable is not available")
     
    805808            self.assertFileEqualsBaseline(this_test_file_directory+"forestry_linearized_cplex.out",this_test_file_directory+"forestry_linearized_cplex_darwin.baseline", filter=filter_time_and_data_dirs)           
    806809        else:
    807             self.assertFileEqualsBaseline(this_test_file_directory+"forestry_linearized_cplex.out",this_test_file_directory+"forestry_linearized_cplex.baseline", filter=filter_time_and_data_dirs)           
     810            [flag_a,lineno_a,diffs_a] = pyutilib.misc.compare_file(this_test_file_directory+"forestry_linearized_cplex.out", this_test_file_directory+"forestry_linearized_cplex.baseline-a", filter=filter_time_and_data_dirs)
     811            [flag_b,lineno_b,diffs_b] = pyutilib.misc.compare_file(this_test_file_directory+"forestry_linearized_cplex.out", this_test_file_directory+"forestry_linearized_cplex.baseline-b", filter=filter_time_and_data_dirs)
     812            if (not flag_a) and (not flag_b):
     813                self.fail("Differences identified relative to all baseline output file alternatives")               
    808814
    809815    @unittest.skipIf(not gurobi_available, "The 'gurobi' executable is not available")
     
    10311037            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_ef_with_solve_cplex.out",this_test_file_directory+"sizes3_ef_with_solve_cplex_darwin.baseline", filter=filter_time_and_data_dirs)               
    10321038        else:
    1033             self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_ef_with_solve_cplex.out",this_test_file_directory+"sizes3_ef_with_solve_cplex.baseline", filter=filter_time_and_data_dirs)               
     1039            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_ef_with_solve_cplex.out",this_test_file_directory+"sizes3_ef_with_solve_cplex.baseline", filter=filter_time_and_data_dirs, tolerance=1e-4)               
    10341040
    10351041    @unittest.skipIf(not gurobi_available, "The 'gurobi' executable is not available")
Note: See TracChangeset for help on using the changeset viewer.