Blocked revisions 75493 via svnmerge

................
  r75493 | nick.coghlan | 2009-10-18 23:19:33 +1000 (Sun, 18 Oct 2009) | 75 lines

  Note that a number of the changes listed below were not applicable to the Py3k branch, and hence the corresponding
  files are unchanged in this checkin. This checkin is also the first time the environment checking in regrtest has
  been forward ported to the Py3k branch.

  This checkin causes test_xmlrpc to fail - see issue 7165 (it's a bug in the 3.x version of xmlrpc.server)
  I am also getting a failure in test_telnetlib, but it isn't clear yet if that is due to these changes.

  Recorded merge of revisions 75400-75401,75404,75406,75414,75416,75422,75425-75428,75435,75439,75441-75444,75447-75449,75451-75453,75455-75458,75460-75469,75471-75473,75475-75477,75479-75481,75483,75486-75489 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75400 | r.david.murray | 2009-10-14 23:58:07 +1000 (Wed, 14 Oct 2009) | 6 lines

    Enhanced Issue 7058 patch, which will not be backported.  Refactors the
    code, adds checks for stdin/out/err, cwd, and sys.path, and adds a new
    section in the summary for tests that modify the environment (thanks to
    Ezio Melotti for that suggestion).
  ........
    r75453 | nick.coghlan | 2009-10-17 16:33:05 +1000 (Sat, 17 Oct 2009) | 1 line

    Correctly restore sys.stdout in test_descr
  ........
    r75456 | nick.coghlan | 2009-10-17 17:30:40 +1000 (Sat, 17 Oct 2009) | 1 line

    Enhancement to the new environment checking code to print the changed items under -vv. Also includes a small tweak to allow underscores in the names of resources.
  ........
    r75457 | nick.coghlan | 2009-10-17 17:34:27 +1000 (Sat, 17 Oct 2009) | 1 line

    Formatting tweak so that before and after values are vertically aligned
  ........
    r75458 | nick.coghlan | 2009-10-17 18:21:21 +1000 (Sat, 17 Oct 2009) | 1 line

    Check and revert expected sys.path alterations
  ........
    r75461 | nick.coghlan | 2009-10-18 00:40:54 +1000 (Sun, 18 Oct 2009) | 1 line

    Restore original sys.path when running TTK tests
  ........
    r75462 | nick.coghlan | 2009-10-18 01:09:41 +1000 (Sun, 18 Oct 2009) | 1 line

    Don't invoke reload(sys) and use StringIO objects instead of real files to capture stdin and stdout when needed (ensures all sys attributes remain unmodified after test_xmlrpc runs)
  ........
    r75463 | nick.coghlan | 2009-10-18 01:23:08 +1000 (Sun, 18 Oct 2009) | 1 line

    Revert changes made to environment in test_httpservers
  ........
    r75465 | nick.coghlan | 2009-10-18 01:45:52 +1000 (Sun, 18 Oct 2009) | 1 line

    Move restoration of the os.environ object into the context manager where it belongs
  ........
    r75466 | nick.coghlan | 2009-10-18 01:48:16 +1000 (Sun, 18 Oct 2009) | 1 line

    Also check and restore identity of sys.path, sys.argv and os.environ rather than just their values (this picked up a few more misbehaving tests)
  ........
    r75467 | nick.coghlan | 2009-10-18 01:57:42 +1000 (Sun, 18 Oct 2009) | 1 line

    Avoid replacing existing modules and sys.path in import tests
  ........
    r75468 | nick.coghlan | 2009-10-18 02:19:51 +1000 (Sun, 18 Oct 2009) | 1 line

    Don't replace sys.path in test_site
  ........
    r75481 | nick.coghlan | 2009-10-18 15:38:48 +1000 (Sun, 18 Oct 2009) | 1 line

    Using CleanImport to revert a reload of the os module doesn't work due to function registrations in copy_reg. The perils of reloading modules even for tests...
  ........
    r75486 | nick.coghlan | 2009-10-18 20:29:10 +1000 (Sun, 18 Oct 2009) | 1 line

    Silence a deprecation warning by using the appropriate replacement construct
  ........
    r75489 | nick.coghlan | 2009-10-18 20:56:21 +1000 (Sun, 18 Oct 2009) | 1 line

    Restore sys.path in test_tk
  ........
................
This commit is contained in:
Nick Coghlan 2009-10-18 13:25:20 +00:00
parent f456a155c6
commit 32832a8705

Diff Content Not Available