[Lldb-commits] [lldb] 180d6ed - [lldb] Skip TestStepScripted with reproducers

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2020-08-13T09:46:52-07:00
New Revision: 180d6ed66778ec5b7ee68878005ca1f0498b6d6d

URL: https://github.com/llvm/llvm-project/commit/180d6ed66778ec5b7ee68878005ca1f0498b6d6d
DIFF: https://github.com/llvm/llvm-project/commit/180d6ed66778ec5b7ee68878005ca1f0498b6d6d.diff

LOG: [lldb] Skip TestStepScripted with reproducers

Some of the test methods were already skipped because of an unexpected
packet. The test started failing after it was expanded. Skip the whole
test with reproducers so we don't have to add the decorator for every
method.

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/decorators.py
    lldb/test/API/functionalities/step_scripted/TestStepScripted.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py
index bdfe6ffd58c02..ee2573fcd9e44 100644
--- a/lldb/packages/Python/lldbsuite/test/decorators.py
+++ b/lldb/packages/Python/lldbsuite/test/decorators.py
@@ -863,8 +863,6 @@ def is_feature_enabled(self):
 
 def skipIfReproducer(func):
     """Skip this test if the environment is set up to run LLDB with reproducers."""
-    def is_reproducer():
-        if configuration.capture_path or configuration.replay_path:
-            return "reproducers unsupported"
-        return None
-    return skipTestIfFn(is_reproducer)(func)
+    return unittest2.skipIf(
+        configuration.capture_path or configuration.replay_path,
+        "reproducers unsupported")(func)

diff  --git a/lldb/test/API/functionalities/step_scripted/TestStepScripted.py b/lldb/test/API/functionalities/step_scripted/TestStepScripted.py
index 60eb961737653..cee0885da9c31 100644
--- a/lldb/test/API/functionalities/step_scripted/TestStepScripted.py
+++ b/lldb/test/API/functionalities/step_scripted/TestStepScripted.py
@@ -7,6 +7,7 @@
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 
+ at skipIfReproducer # FIXME: Unexpected packet during (active) replay
 class StepScriptedTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
@@ -18,14 +19,12 @@ def setUp(self):
         self.main_source_file = lldb.SBFileSpec("main.c")
         self.runCmd("command script import Steps.py")
 
-    @skipIfReproducer # FIXME: Unexpected packet during (active) replay
     def test_standard_step_out(self):
         """Tests stepping with the scripted thread plan laying over a standard 
         thread plan for stepping out."""
         self.build()
         self.step_out_with_scripted_plan("Steps.StepOut")
 
-    @skipIfReproducer # FIXME: Unexpected packet during (active) replay
     def test_scripted_step_out(self):
         """Tests stepping with the scripted thread plan laying over an another 
         scripted thread plan for stepping out."""
@@ -65,12 +64,10 @@ def test_misspelled_plan_name(self):
         # Make sure we didn't let the process run:
         self.assertEqual(stop_id, process.GetStopID(), "Process didn't run")
         
-    @skipIfReproducer # FIXME: Unexpected packet during (active) replay
     def test_checking_variable(self):
         """Test that we can call SBValue API's from a scripted thread plan - using SBAPI's to step"""
         self.do_test_checking_variable(False)
         
-    @skipIfReproducer # FIXME: Unexpected packet during (active) replay
     def test_checking_variable_cli(self):
         """Test that we can call SBValue API's from a scripted thread plan - using cli to step"""
         self.do_test_checking_variable(True)