[Pydev-cvs] org.python.pydev.debug/pysrc/tests test_pydevdio.py, 1.2, 1.3 test_runfiles.py, 1.2, 1.3 _debugger_case1.py, 1.3, NONE test_debugger.py, 1.2, NONE

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

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

Modified Files:
	test_pydevdio.py test_runfiles.py 
Removed Files:
	_debugger_case1.py test_debugger.py 
Log Message:
Made python run the tests too (in the regular tests structure for java)

Index: test_pydevdio.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/tests/test_pydevdio.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_pydevdio.py	12 Sep 2006 00:15:45 -0000	1.2
--- test_pydevdio.py	27 May 2007 13:27:09 -0000	1.3
***************
*** 1,10 ****
  import sys
  import os
- import test_pydevdio #@UnresolvedImport - importing itself
  
- #make it as if we were executing from the directory above this one (so that we can use jycompletionserver
- #without the need for it being in the pythonpath)
- #(twice the dirname to get the previous level from this file.)
- sys.path.insert(1, os.path.join(  os.path.dirname(os.path.dirname( test_pydevdio.__file__ )) ))
  
  import unittest
--- 1,5 ----
***************
*** 13,31 ****
      
      def testIt(self):
!         import pydevd_io
!         original = sys.stdout
          
          try:
!             sys.stdout = pydevd_io.IOBuf()
!             print 'foo'
!             print 'bar'
!             
!             self.assertEquals('foo\nbar\n', sys.stdout.getvalue()) #@UndefinedVariable
              
!             print 'ww'
!             print 'xx'
!             self.assertEquals('ww\nxx\n', sys.stdout.getvalue()) #@UndefinedVariable
          finally:
!             sys.stdout = original
          
  if __name__ == '__main__':
--- 8,37 ----
      
      def testIt(self):
!         #make it as if we were executing from the directory above this one (so that we can use jycompletionserver
!         #without the need for it being in the pythonpath)
!         #(twice the dirname to get the previous level from this file.)
!         import test_pydevdio #@UnresolvedImport - importing itself
!         ADD_TO_PYTHONPATH = os.path.join(  os.path.dirname(os.path.dirname( test_pydevdio.__file__ )) )
!         sys.path.insert(0, ADD_TO_PYTHONPATH)
          
          try:
!             import pydevd_io
!             original = sys.stdout
              
!             try:
!                 sys.stdout = pydevd_io.IOBuf()
!                 print 'foo'
!                 print 'bar'
!                 
!                 self.assertEquals('foo\nbar\n', sys.stdout.getvalue()) #@UndefinedVariable
!                 
!                 print 'ww'
!                 print 'xx'
!                 self.assertEquals('ww\nxx\n', sys.stdout.getvalue()) #@UndefinedVariable
!             finally:
!                 sys.stdout = original
          finally:
!             #remove it to leave it ok for other tests
!             sys.path.remove(ADD_TO_PYTHONPATH)
          
  if __name__ == '__main__':

--- test_debugger.py DELETED ---

Index: test_runfiles.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/tests/test_runfiles.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_runfiles.py	18 Sep 2006 21:54:17 -0000	1.2
--- test_runfiles.py	27 May 2007 13:27:09 -0000	1.3
***************
*** 20,25 ****
  import re
  
  
! 
  
  class RunfilesTest(unittest.TestCase):
--- 20,33 ----
  import re
  
+ #this is an early test because it requires the sys.path changed
+ orig_syspath = sys.path
+ a_file = runfiles.__file__
+ runfiles.PydevTestRunner(test_dir = [a_file])
+ file_dir = os.path.dirname(a_file)
+ assert file_dir in sys.path
+ sys.path = orig_syspath[:]
  
! #remove it so that we leave it ok for other tests
! sys.path.remove(desired_runfiles_path)
  
  class RunfilesTest(unittest.TestCase):
***************
*** 85,95 ****
          sys.path = orig_syspath[:]
      
-     def test___adjust_python_path_works_for_a_file(self):
-         orig_syspath = sys.path
-         a_file = runfiles.__file__
-         runfiles.PydevTestRunner(test_dir = [a_file])
-         file_dir = os.path.dirname(a_file)
-         self.assertEquals( 1, file_dir in sys.path )
-         sys.path = orig_syspath[:]
      
      def test___adjust_python_path_breaks_for_unkown_type(self):
--- 93,96 ----

--- _debugger_case1.py DELETED ---