PP-1089-1090: Skipping tests instead of failing them when no.of MoMs …

…hosts provided is not as per the expectations of the test.
openpbs · Nov 21, 2017 · 1724245 · 1724245
1 parent 3a1a04e
commit 1724245
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/test/tests/functional/pbs_hook_execjob_prologue.py b/test/tests/functional/pbs_hook_execjob_prologue.py
@@ -49,7 +49,6 @@ class TestPbsExecutePrologue(TestFunctional):
     def setUp(self):
         if len(self.moms) != 3:
             self.skip_test(reason="need 3 mom hosts: -p moms=<m1>:<m2>:<m3>")
-            return
 
         TestFunctional.setUp(self)
 

diff --git a/...unctional/pbs_test_rerun_timeout_error.py → ...nctional/pbs_job_requeue_timeout_error.py b/...unctional/pbs_test_rerun_timeout_error.py → ...nctional/pbs_job_requeue_timeout_error.py
@@ -50,9 +50,7 @@ def setUp(self):
         TestFunctional.setUp(self)
 
         if len(self.moms) != 2:
-            self.logger.error('test requires two MoMs as input, ' +
-                              '  use -p moms=<mom1>:<mom2>')
-            self.assertEqual(len(self.moms), 2)
+            self.skip_test(reason="need 2 mom hosts: -p moms=<m1>:<m2>")
 
         self.server.set_op_mode(PTL_CLI)
 

diff --git a/test/tests/functional/pbs_node_rampdown.py b/test/tests/functional/pbs_node_rampdown.py
@@ -271,7 +271,6 @@ def setUp(self):
 
         if len(self.moms) != 3:
             self.skip_test(reason="need 3 mom hosts: -p moms=<m1>:<m2>:<m3>")
-            return
 
         TestFunctional.setUp(self)
         Job.dflt_attributes[ATTR_k] = 'oe'

diff --git a/test/tests/functional/pbs_only_small_files_over_tpp.py b/test/tests/functional/pbs_only_small_files_over_tpp.py
@@ -50,9 +50,7 @@ def setUp(self):
         TestFunctional.setUp(self)
 
         if len(self.moms) != 2:
-            self.logger.error('test requires two MoMs as input, ' +
-                              '  use -p moms=<mom1>:<mom2>')
-            self.assertEqual(len(self.moms), 2)
+            self.skip_test(reason="need 2 mom hosts: -p moms=<m1>:<m2>")
 
         self.server.set_op_mode(PTL_CLI)