[Python-checkins] cpython (merge 3.3 -> default): Merge #15415 Windows buildbot change from 3.3
nick.coghlan
python-checkins at python.org
Mon Jul 29 07:19:44 CEST 2013
http://hg.python.org/cpython/rev/b14308524cff
changeset: 84895:b14308524cff
parent: 84892:4d08db5edbaa
parent: 84894:a76693942de3
user: Nick Coghlan <ncoghlan at gmail.com>
date: Mon Jul 29 15:19:29 2013 +1000
summary:
Merge #15415 Windows buildbot change from 3.3
files:
Lib/test/test_startfile.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py
--- a/Lib/test/test_startfile.py
+++ b/Lib/test/test_startfile.py
@@ -21,12 +21,12 @@
self.assertRaises(OSError, startfile, "nonexisting.vbs")
def test_empty(self):
- # Switch to an existing, but safe, working directory to let the
- # cleanup code do its thing without permission errors.
- with support.temp_cwd(path=path.dirname(sys.executable)):
- empty = path.join(path.dirname(__file__), "empty.vbs")
+ # startfile is a little odd when it comes to handling absolute
+ # paths, so we briefly switch to the main test directory
+ # and use a relative path
+ with support.change_cwd(support.TEST_HOME):
+ empty = "empty.vbs"
startfile(empty)
- startfile(empty, "open")
def test_main():
support.run_unittest(TestCase)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list