[Py2exe-checkins] py2exe/test reinstall.cmd, NONE, 1.1 setup_noZipFile.py, 1.1, 1.2 setup_win32com_shell.py, 1.1, 1.2 test.py, 1.8, 1.9 test.cmd, 1.3, NONE

[Jimmy R. <jr...@us...>]

Update of /cvsroot/py2exe/py2exe/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30259

Modified Files:
	setup_noZipFile.py setup_win32com_shell.py test.py 
Added Files:
	reinstall.cmd 
Removed Files:
	test.cmd 
Log Message:
Run the tests using test.py rather than test.cmd. This enables smarter logic to determine the interpreters present (e.g., if the interpreter can't be run because it is for CE, then don't use it to run tests). Also report statistics about the number of tests that succeeded/skipped/failed.

--- test.cmd DELETED ---

Index: setup_win32com_shell.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/test/setup_win32com_shell.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup_win32com_shell.py	17 Apr 2008 18:20:07 -0000	1.1
--- setup_win32com_shell.py	19 May 2008 07:18:55 -0000	1.2
***************
*** 21,25 ****
  
  setup(
-       script_args=['py2exe', '%s'],
        console=['%s'],
       )
--- 21,24 ----

Index: test.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/test/test.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test.py	17 Apr 2008 18:20:07 -0000	1.8
--- test.py	19 May 2008 07:18:55 -0000	1.9
***************
*** 18,25 ****
  import subprocess
  import sys
  
  
  excludedTestFiles = dict(
!     AMD64=['test_win32com.shell.py'],
      Intel=[],
  )
--- 18,26 ----
  import subprocess
  import sys
+ import time
  
  
  excludedTestFiles = dict(
!     AMD64=['test_pysvn', 'test_win32com_shell.py'],
      Intel=[],
  )
***************
*** 41,45 ****
  from distutils.core import setup
  import py2exe
! setup(script_args=['py2exe', '%s'], console = ['%s'])
  """
  
--- 42,46 ----
  from distutils.core import setup
  import py2exe
! setup(console = ['%s'])
  """
  
***************
*** 47,55 ****
  
  
! def getPlatform():
      for platform in 'AMD64', 'Intel':
!         if '(' + platform + ')' in sys.version:
              return platform
!     raise RuntimeError("Can't determine Intel vs. AMD64 from: " + sys.version)
  
  
--- 48,77 ----
  
  
! def getPlatform(version):
      for platform in 'AMD64', 'Intel':
!         if '(' + platform + ')' in version:
              return platform
!     raise RuntimeError("Can't determine Intel vs. AMD64 from: " + version)
! 
! 
! def PythonInterpreters(pattern):
!     for folder in glob.glob(pattern):
!         path = os.path.join(folder, 'python.exe')
!         if os.path.exists(path):
!             errorlevel, output = run(path, '-c', 'import sys; print sys.version')
!             if errorlevel == 0:
!                 yield output.strip(), path
! 
! 
! def shortVersion(version):
!     return '%s-%s' % (version.split()[0], getPlatform(version))
! 
! 
! def reasonForSkipping(interpreter, basename):
!     errorlevel, output = run(interpreter, 'checkTestModule.py', basename)
!     if errorlevel:
!         return output.strip()
!     else:
!         return None
  
  
***************
*** 70,116 ****
                              )
      output = popen.communicate()
!     return popen.returncode, output
  
  
! def main(pattern='test_*.py'):
!     print 'Python', sys.version
!     for test in glob.glob(pattern):
!         if test not in excludedTestFiles[getPlatform()]:
!             print '   ', test
  
!             basename = os.path.splitext(test)[0]
!             try:
!                 __import__(basename)
!             except ImportError, details:
!                 print "(Skipping %s: %s)" % (basename, details)
!                 continue
  
!             # Execute script to get baseline
!             baseline = run(sys.executable, test)
!             exe = os.path.join('dist', basename + '.exe')
!             exe2 = os.path.join('dist', basename + '_2.exe')
  
!             for option in options.get(test, ['--quiet', '--compressed', '--bundle=1', '--bundle=2', '--bundle=3', '--ascii', '--skip-archive']):
!                 if option not in excludedTestOptions[getPlatform()]:
!                     # Build exe
!                     clean()
!                     print '       ', option
!                     if os.path.exists(test.replace('test_', 'setup_')):
!                         open(generatedSetup, 'wt').write(open(test.replace('test_', 'setup_'), 'rt').read() % (option, test))
!                     else:
!                         open(generatedSetup, 'wt').write(py2exeTemplate % (option, test))
!                     run(sys.executable, generatedSetup)
  
!                     # Run exe and test against baseline
!                     os.rename(exe, exe2) # ensure that the exe works when renamed
!                     out2 = run(exe2)
!                     if out2 != baseline:
!                         print "FAILED."
!                         print "\tExpected:", baseline
!                         print "\tGot:", out2
  
!     clean()
  
  
  if __name__ == '__main__':
!     main(*sys.argv[1:])
--- 92,166 ----
                              )
      output = popen.communicate()
!     return popen.returncode, output[0]
  
  
! def main(interpreter_pattern=r'C:\Python*', test_pattern='test_*.py'):
!     start = time.time()
!     succeeded = {}
!     skipped = {}
!     failed = {}
!     versions = []
!     for version, interpreter in PythonInterpreters(interpreter_pattern):
!         print 'Python', version
!         versions.append(version)
!         succeeded[version] = 0
!         skipped[version] = 0
!         failed[version] = 0
!         for test in glob.glob(test_pattern):
!             if test not in excludedTestFiles[getPlatform(version)]:
!                 print '   ', test
!                 basename = os.path.splitext(test)[0]
!                 reason = reasonForSkipping(interpreter, basename)
!                 if reason:
!                     print '        SKIPPED: %s' % reason
!                     skipped[version] += 1
!                     continue
  
!                 # Execute script to get baseline
!                 baseline = run(interpreter, test)
!                 exe = os.path.join('dist', basename + '.exe')
!                 exe2 = os.path.join('dist', basename + '_2.exe')
  
!                 for option in options.get(test, ['--quiet', '--compressed', '--bundle=1', '--bundle=2', '--bundle=3', '--ascii', '--skip-archive']):
!                     if option not in excludedTestOptions[getPlatform(version)]:
!                         # Build exe
!                         clean()
!                         print '       ', option
!                         if os.path.exists(test.replace('test_', 'setup_')):
!                             open(generatedSetup, 'wt').write(open(test.replace('test_', 'setup_'), 'rt').read() % test)
!                         else:
!                             open(generatedSetup, 'wt').write(py2exeTemplate % test)
!                         run(sys.executable, generatedSetup, 'py2exe', option)
  
!                         # Run exe and test against baseline
!                         os.rename(exe, exe2) # ensure that the exe works when renamed
!                         out2 = run(exe2)
!                         if out2 == baseline:
!                             succeeded[version] += 1
!                         else:
!                             failed[version] += 1
!                             print "FAILED."
!                             print "\tExpected:", baseline
!                             print "\t     Got:", out2
!                             print
  
!         clean()
!         print
  
!     columnWidth = max(map(len, map(shortVersion, versions)))
!     format = '%' + str(columnWidth) + 's'
!     format = ' '.join(4*[format])
!     separator = ' '.join(4*[columnWidth*'-'])
!     print round(time.time()-start, 1), 'seconds'
!     print
!     print format % ('', 'Succeeded', 'Skipped', 'Failed')
!     print separator
!     for version in versions:
!         print format % (shortVersion(version), succeeded[version], skipped[version], failed[version])
!     print separator
!     print format % ('TOTAL', sum(succeeded.values()), sum(skipped.values()), sum(failed.values()))
!     return sum(failed.values())
  
  
  if __name__ == '__main__':
!     sys.exit(main(*sys.argv[1:]))

Index: setup_noZipFile.py
===================================================================
RCS file: /cvsroot/py2exe/py2exe/test/setup_noZipFile.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup_noZipFile.py	5 Apr 2008 11:48:10 -0000	1.1
--- setup_noZipFile.py	19 May 2008 07:18:55 -0000	1.2
***************
*** 3,7 ****
  
  setup(
-       script_args=['py2exe', '%s'],
        console=['%s'],
        zipfile=None,
--- 3,6 ----

--- NEW FILE: reinstall.cmd ---
"C:\Python23\Removepy2exe.exe" -u "C:\Python23\py2exe-wininst.log"
"C:\Python24\Removepy2exe.exe" -u "C:\Python24\py2exe-wininst.log"
"C:\Python25\Removepy2exe.exe" -u "C:\Python25\py2exe-wininst.log"

for %%f in (..\dist\py2exe*.exe) do (
    "%%f"
)

for %%f in (..\dist\py2exe*.msi) do (
    "%%f"
)