Update of /cvsroot/pydev/org.python.pydev.debug/pysrc/tests_python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6612/pysrc/tests_python
Modified Files:
test_debugger.py
Added Files:
_debugger_case10.py
Log Message:
Fixed problem when making a step-return.
--- NEW FILE: _debugger_case10.py ---
def Method1():
print 'm1'
print 'm1'
def Method1a():
print 'm1a'
print 'm1a'
def Method2():
print 'm2 before'
Method1()
Method1a()
print 'm2 after'
if __name__ == '__main__':
Method2()
print 'TEST SUCEEDED!'
Index: test_debugger.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/tests_python/test_debugger.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** test_debugger.py 12 Apr 2008 18:09:10 -0000 1.13
--- test_debugger.py 9 May 2008 22:22:05 -0000 1.14
***************
*** 168,171 ****
--- 168,174 ----
def WriteAddBreakpoint(self, line, func):
+ '''
+ @param line: starts at 1
+ '''
if func is not None:
self.Write("111\t%s\t%s\t%s\t**FUNC**%s\tNone" % (self.NextSeq(), self.TEST_FILE, line, func))
***************
*** 200,203 ****
--- 203,240 ----
#=======================================================================================================================
+ # WriterThreadCase10
+ #======================================================================================================================
+ class WriterThreadCase10(AbstractWriterThread):
+
+ TEST_FILE = NormFile('_debugger_case10.py')
+
+ def run(self):
+ self.StartSocket()
+ self.WriteAddBreakpoint(2, 'Method1')
+ self.WriteMakeInitialRun()
+
+ threadId, frameId = self.WaitForBreakpointHit('111')
+
+ self.WriteStepReturn(threadId)
+
+ threadId, frameId, line = self.WaitForBreakpointHit('109', True)
+
+ assert line == 11, 'Expected return to be in line 11, was: %s' % line
+
+ self.WriteStepOver(threadId)
+
+ threadId, frameId, line = self.WaitForBreakpointHit('108', True)
+
+ assert line == 12, 'Expected return to be in line 12, was: %s' % line
+
+ self.WriteRunThread(threadId)
+
+ assert 11 == self._sequence, 'Expected 11. Had: %s' % self._sequence
+
+ self.finishedOk = True
+
+
+
+ #=======================================================================================================================
# WriterThreadCase9
#======================================================================================================================
***************
*** 603,606 ****
--- 640,646 ----
def testCase9(self):
self.CheckCase(WriterThreadCase9)
+
+ def testCase10(self):
+ self.CheckCase(WriterThreadCase10)
***************
*** 632,635 ****
--- 672,678 ----
self.CheckCase(WriterThreadCase9, False)
+ def testCase10a(self):
+ self.CheckCase(WriterThreadCase10, False)
+
***************
*** 641,645 ****
# suite = unittest.TestSuite()
! # suite.addTest(Test('testCase1'))
unittest.TextTestRunner(verbosity=1).run(suite)
--- 684,688 ----
# suite = unittest.TestSuite()
! # suite.addTest(Test('testCase10'))
unittest.TextTestRunner(verbosity=1).run(suite)
|
