changeset: 84895:b14308524cff
parent: 84892:4d08db5edbaa
parent: 84894:a76693942de3
user: Nick Coghlan <ncoghlan@gmail.com>
date: Mon Jul 29 15:19:29 2013 +1000
description:
Merge #15415 Windows buildbot change from 3.3
diff -r 4d08db5edbaa -r b14308524cff Lib/test/test_startfile.py
--- a/Lib/test/test_startfile.py	Sun Jul 28 16:40:07 2013 -0400
+++ b/Lib/test/test_startfile.py	Mon Jul 29 15:19:29 2013 +1000
@@ -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)
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/b14308524cff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/b14308524cff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>