[Pydev-cvs] org.python.pydev.debug/pysrc/tests_python test_debugger.py, 1.15, 1.16

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.debug/pysrc/tests_python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6683/pysrc/tests_python

Modified Files:
	test_debugger.py 
Log Message:
Step-return skips breakpoints.

Index: test_debugger.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/tests_python/test_debugger.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_debugger.py	10 May 2008 16:30:03 -0000	1.15
--- test_debugger.py	10 May 2008 17:31:13 -0000	1.16
***************
*** 138,142 ****
              time.sleep(1)
              if i >= 10:
!                 raise AssertionError('After %s seconds, a break was not hit.' % i)
              
          #we have something like <xml><thread id="12152656" stop_reason="111"><frame id="12453120" ...
--- 138,143 ----
              time.sleep(1)
              if i >= 10:
!                 raise AssertionError('After %s seconds, a break with reason: %s was not hit. Found: %s' % \
!                     (i, reason, self.readerThread.lastReceived))
              
          #we have something like <xml><thread id="12152656" stop_reason="111"><frame id="12453120" ...
***************
*** 203,206 ****
--- 204,236 ----
  
  #=======================================================================================================================
+ # WriterThreadCase12
+ #======================================================================================================================
+ class WriterThreadCase12(AbstractWriterThread):
+     
+     TEST_FILE = NormFile('_debugger_case10.py')
+         
+     def run(self):
+         self.StartSocket()
+         self.WriteAddBreakpoint(2, 'Method1') 
+         self.WriteAddBreakpoint(11, 'Method2') 
+         self.WriteMakeInitialRun()
+         
+         threadId, frameId = self.WaitForBreakpointHit('111')
+         
+         self.WriteStepReturn(threadId)
+         
+         threadId, frameId, line = self.WaitForBreakpointHit('111', True) #not a return (it stopped in the other breakpoint)
+         
+         assert line == 2, 'Expected return to be in line 2, was: %s' % line
+         
+         self.WriteRunThread(threadId)
+ 
+         assert 11 == self._sequence, 'Expected 11. Had: %s'  % self._sequence
+         
+         self.finishedOk = True
+         
+ 
+ 
+ #=======================================================================================================================
  # WriterThreadCase11
  #======================================================================================================================
***************
*** 687,690 ****
--- 717,723 ----
      def testCase11(self):
          self.CheckCase(WriterThreadCase11)
+         
+     def testCase12(self):
+         self.CheckCase(WriterThreadCase12)
  
              
***************
*** 722,725 ****
--- 755,761 ----
          self.CheckCase(WriterThreadCase11, False)
          
+     def testCase12a(self):
+         self.CheckCase(WriterThreadCase12, False)
+         
          
  
***************
*** 731,735 ****
      
  #    suite = unittest.TestSuite()
! #    suite.addTest(Test('testCase11'))
      unittest.TextTestRunner(verbosity=1).run(suite)
  
--- 767,771 ----
      
  #    suite = unittest.TestSuite()
! #    suite.addTest(Test('testCase12'))
      unittest.TextTestRunner(verbosity=1).run(suite)