1 files changed, 37 insertions, 29 deletions

diff --git a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_case_sensitivity/TestBreakpointCaseSensitivity.py b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_case_sensitivity/TestBreakpointCaseSensitivity.py
index aa4ee14ffc5a..88ccc4644192 100644
--- a/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_case_sensitivity/TestBreakpointCaseSensitivity.py
+++ b/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_case_sensitivity/TestBreakpointCaseSensitivity.py
@@ -9,6 +9,7 @@ from lldbsuite.test.lldbtest import *
 from lldbsuite.test.decorators import *
 from lldbsuite.test import lldbplatform, lldbplatformutil
 
+
 class BreakpointCaseSensitivityTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
     BREAKPOINT_TEXT = 'Set a breakpoint here'
@@ -18,14 +19,13 @@ class BreakpointCaseSensitivityTestCase(TestBase):
         TestBase.setUp(self)
         self.line = line_number('main.c', self.BREAKPOINT_TEXT)
 
-    @skipIf(oslist=no_match(['windows']))  # Skip for non-windows platforms
+    @skipIf(hostoslist=no_match(['windows']))  # Skip for non-windows platforms
     def test_breakpoint_matches_file_with_different_case(self):
         """Set breakpoint on file, should match files with different case on Windows"""
         self.build()
         self.case_sensitivity_breakpoint(True)
 
-    @skipIf(oslist=['windows']) # Skip for windows platforms
-    @expectedFailureAll() # Failing for unknown reason on non-Windows platforms.
+    @skipIf(hostoslist=['windows'])  # Skip for windows platforms
     def test_breakpoint_doesnt_match_file_with_different_case(self):
         """Set breakpoint on file, shouldn't match files with different case on POSIX systems"""
         self.build()
@@ -33,19 +33,19 @@ class BreakpointCaseSensitivityTestCase(TestBase):
 
     def case_sensitivity_breakpoint(self, case_insensitive):
         """Set breakpoint on file, should match files with different case if case_insensitive is True"""
-        
+
         # use different case to check CreateTarget
         exe = 'a.out'
         if case_insensitive:
             exe = exe.upper()
-            
+
         exe = os.path.join(os.getcwd(), exe)
 
         # Create a target by the debugger.
         self.target = self.dbg.CreateTarget(exe)
         self.assertTrue(self.target, VALID_TARGET)
-        cwd = self.get_process_working_directory();
-                
+        cwd = os.getcwd()
+
         # try both BreakpointCreateByLocation and BreakpointCreateBySourceRegex
         for regex in [False, True]:
             # should always hit
@@ -68,47 +68,55 @@ class BreakpointCaseSensitivityTestCase(TestBase):
     def check_breakpoint(self, file, source_regex, should_hit):
         """
         Check breakpoint hit at given file set by given method
-        
+
         file:
             File where insert the breakpoint
-        
+
         source_regex:
             True for testing using BreakpointCreateBySourceRegex,
             False for  BreakpointCreateByLocation
-            
+
         should_hit:
             True if the breakpoint should hit, False otherwise
         """
-        
-        desc = ' file %s set by %s' % (file, 'regex' if source_regex else 'location')
+
+        desc = ' file %s set by %s' % (
+            file, 'regex' if source_regex else 'location')
         if source_regex:
-            breakpoint = self.target.BreakpointCreateBySourceRegex(self.BREAKPOINT_TEXT,
-                                                                   lldb.SBFileSpec(file))
-        else:    
-            breakpoint = self.target.BreakpointCreateByLocation(file, self.line)
-        
+            breakpoint = self.target.BreakpointCreateBySourceRegex(
+                self.BREAKPOINT_TEXT, lldb.SBFileSpec(file))
+        else:
+            breakpoint = self.target.BreakpointCreateByLocation(
+                file, self.line)
+
         self.assertEqual(breakpoint and breakpoint.GetNumLocations() == 1,
-                    should_hit,
-                    VALID_BREAKPOINT + desc)
+                         should_hit,
+                         VALID_BREAKPOINT + desc)
 
         # Get the breakpoint location from breakpoint after we verified that,
         # indeed, it has one location.
         location = breakpoint.GetLocationAtIndex(0)
-        self.assertEqual(location and location.IsEnabled(),
-                    should_hit,
-                    VALID_BREAKPOINT_LOCATION + desc)
-        
-        process = self.target.LaunchSimple(None, None, self.get_process_working_directory())
+
+        self.assertEqual(location.IsValid(),
+                         should_hit,
+                         VALID_BREAKPOINT_LOCATION + desc)
+
+        process = self.target.LaunchSimple(
+            None, None, self.get_process_working_directory())
         self.assertTrue(process, PROCESS_IS_VALID + desc)
 
         if should_hit:
             # Did we hit our breakpoint?
-            from lldbsuite.test.lldbutil import get_threads_stopped_at_breakpoint 
-            threads = get_threads_stopped_at_breakpoint (process, breakpoint)
-            self.assertEqual(len(threads), 1, "There should be a thread stopped at breakpoint" + desc)
+            from lldbsuite.test.lldbutil import get_threads_stopped_at_breakpoint
+            threads = get_threads_stopped_at_breakpoint(process, breakpoint)
+            self.assertEqual(
+                len(threads),
+                1,
+                "There should be a thread stopped at breakpoint" +
+                desc)
             # The hit count for the breakpoint should be 1.
             self.assertEqual(breakpoint.GetHitCount(), 1)
-            
+
         else:
             # check the breakpoint was not hit
             self.assertEqual(lldb.eStateExited, process.GetState())
@@ -116,6 +124,6 @@ class BreakpointCaseSensitivityTestCase(TestBase):
 
         # let process finish
         process.Continue()
-        
+
         # cleanup
         self.target.BreakpointDelete(breakpoint.GetID())