Changeset 5843


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

More alternative baseline updates, triggered by carr migration.

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

    r5842 r5843  
    12601260            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.out",this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro_darwin.baseline", filter=filter_pyro)
    12611261        else:
     1262            [flag_a,lineno_a,diffs_a] = pyutilib.misc.compare_file(this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.out", this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.baseline-a", filter=filter_pyro)
     1263            [flag_b,lineno_b,diffs_b] = pyutilib.misc.compare_file(this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.out", this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.baseline-b", filter=filter_pyro)
     1264            if (not flag_a) and (not flag_b):
     1265                self.fail("Differences identified relative to all baseline output file alternatives")               
     1266           
    12621267            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.out",this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.baseline", filter=filter_pyro)
    12631268
     
    13011306            if (not flag_a) and (not flag_b):
    13021307                self.fail("Differences identified relative to all baseline output file alternatives")               
    1303 
    13041308    @unittest.skipIf(not gurobi_available or not mpirun_available, "Either the 'gurobi' executable is not available or the 'mpirun' executable is not available")
    13051309    def test_quadratic_sizes3_gurobi_with_phpyro(self):
Note: See TracChangeset for help on using the changeset viewer.