Changeset 5787


Ignore:
Timestamp:
May 18, 2012 10:19:32 PM (7 years ago)
Author:
jwatson
Message:

Adding screens for mpirun that were missing in some pysp tests.

File:
1 edited

Legend:

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

    r5786 r5787  
    14001400    # the primary objective of this test is to validate the bare minimum level of functionality on the PH solver server
    14011401    # end (solves and rho setting) - obviously should yield the same results as serial PH.
    1402     @unittest.skipIf(not cplex_available, "The 'cplex' executable is not available")
     1402    @unittest.skipIf(not cplex_available or not mpirun_available, "Either the 'cplex' executable is not available or the 'mpirun' executable is not available")   
    14031403    def test_simple_quadratic_networkflow1ef10_cplex_with_phpyro(self):
    14041404        networkflow_example_dir = pysp_examples_dir + "networkflow"
     
    14191419    # builds on the above test, to validate warm-start capabilities; by imposing a migap,
    14201420    # executions with and without warm-starts will arrive at different solutions.
    1421     @unittest.skipIf(not cplex_available, "The 'cplex' executable is not available")
     1421    @unittest.skipIf(not cplex_available or not mpirun_available, "Either the 'cplex' executable is not available or the 'mpirun' executable is not available")   
    14221422    def test_advanced_quadratic_networkflow1ef10_cplex_with_phpyro(self):
    14231423        networkflow_example_dir = pysp_examples_dir + "networkflow"
     
    14671467            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_linearized_gurobi_with_phpyro.out",this_test_file_directory+"networkflow1ef10_linearized_gurobi_with_phpyro.baseline", filter=filter_pyro)
    14681468
    1469     @unittest.skipIf(not cplex_available, "The 'cplex' executable is not available")
     1469    @unittest.skipIf(not cplex_available or not mpirun_available, "Either the 'cplex' executable is not available or the 'mpirun' executable is not available")
    14701470    def test_simple_linearized_networkflow1ef3_cplex_with_phpyro(self):
    14711471        networkflow_example_dir = pysp_examples_dir + "networkflow"
     
    14901490           
    14911491
    1492     @unittest.skipIf(not cplex_available, "The 'cplex' executable is not available")
     1492    @unittest.skipIf(not cplex_available or not mpirun_available, "Either the 'cplex' executable is not available or the 'mpirun' executable is not available")
    14931493    def test_simple_linearized_networkflow1ef10_cplex_with_phpyro(self):
    14941494        networkflow_example_dir = pysp_examples_dir + "networkflow"
     
    15091509        self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_simple_linearized_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef10_simple_linearized_cplex_with_phpyro.baseline", filter=filter_pyro)
    15101510       
    1511     @unittest.skipIf(not cplex_available, "The 'cplex' executable is not available")
     1511    @unittest.skipIf(not cplex_available or not mpirun_available, "Either the 'cplex' executable is not available or the 'mpirun' executable is not available")
    15121512    def test_advanced_linearized_networkflow1ef10_cplex_with_phpyro(self):
    15131513        networkflow_example_dir = pysp_examples_dir + "networkflow"
     
    15351535            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_advanced_linearized_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef10_advanced_linearized_cplex_with_phpyro.baseline", filter=filter_pyro)
    15361536
    1537     @unittest.skipIf(not cplex_available, "The 'cplex' executable is not available")
     1537    @unittest.skipIf(not cplex_available or not mpirun_available, "Either the 'cplex' executable is not available or the 'mpirun' executable is not available")
    15381538    def test_linearized_networkflow1ef10_cplex_with_bundles_with_phpyro(self):
    15391539        networkflow_example_dir = pysp_examples_dir + "networkflow"
Note: See TracChangeset for help on using the changeset viewer.