changeset:   90881:5a71a7e60fe6
parent:      90878:c69e8ea3bf10
parent:      90880:a981a088512c
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Wed May 28 18:14:03 2014 +0300
files:       Misc/NEWS
description:
Issue #21493: Added test for ntpath.expanduser().  Original patch by
Claudiu Popa.


diff -r c69e8ea3bf10 -r 5a71a7e60fe6 Lib/test/test_ntpath.py
--- a/Lib/test/test_ntpath.py	Wed May 28 16:57:55 2014 +0300
+++ b/Lib/test/test_ntpath.py	Wed May 28 18:14:03 2014 +0300
@@ -258,6 +258,41 @@
             check('%spam%bar', '%sbar' % nonascii)
             check('%{}%bar'.format(nonascii), 'ham%sbar' % nonascii)
 
+    def test_expanduser(self):
+        tester('ntpath.expanduser("test")', 'test')
+
+        with support.EnvironmentVarGuard() as env:
+            env.clear()
+            tester('ntpath.expanduser("~test")', '~test')
+
+            env['HOMEPATH'] = 'eric\\idle'
+            env['HOMEDRIVE'] = 'C:\\'
+            tester('ntpath.expanduser("~test")', 'C:\\eric\\test')
+            tester('ntpath.expanduser("~")', 'C:\\eric\\idle')
+
+            del env['HOMEDRIVE']
+            tester('ntpath.expanduser("~test")', 'eric\\test')
+            tester('ntpath.expanduser("~")', 'eric\\idle')
+
+            env.clear()
+            env['USERPROFILE'] = 'C:\\eric\\idle'
+            tester('ntpath.expanduser("~test")', 'C:\\eric\\test')
+            tester('ntpath.expanduser("~")', 'C:\\eric\\idle')
+
+            env.clear()
+            env['HOME'] = 'C:\\idle\\eric'
+            tester('ntpath.expanduser("~test")', 'C:\\idle\\test')
+            tester('ntpath.expanduser("~")', 'C:\\idle\\eric')
+
+            tester('ntpath.expanduser("~test\\foo\\bar")',
+                   'C:\\idle\\test\\foo\\bar')
+            tester('ntpath.expanduser("~test/foo/bar")',
+                   'C:\\idle\\test/foo/bar')
+            tester('ntpath.expanduser("~\\foo\\bar")',
+                   'C:\\idle\\eric\\foo\\bar')
+            tester('ntpath.expanduser("~/foo/bar")',
+                   'C:\\idle\\eric/foo/bar')
+
     def test_abspath(self):
         # ntpath.abspath() can only be used on a system with the "nt" module
         # (reasonably), so we protect this test with "import nt".  This allows
diff -r c69e8ea3bf10 -r 5a71a7e60fe6 Misc/NEWS
--- a/Misc/NEWS	Wed May 28 16:57:55 2014 +0300
+++ b/Misc/NEWS	Wed May 28 18:14:03 2014 +0300
@@ -15,8 +15,6 @@
   time issue noticeable when compiling code with a large number of "and"
   and "or" operators.
 
-- Issue #19925: Added tests for the spwd module. Original patch by Vajrasky Kok.
-
 - Issue #21418: Fix a crash in the builtin function super() when called without
   argument and without current frame (ex: embedded Python).
 
@@ -511,6 +509,11 @@
 Tests
 -----
 
+- Issue #21493: Added test for ntpath.expanduser().  Original patch by
+  Claudiu Popa.
+
+- Issue #19925: Added tests for the spwd module. Original patch by Vajrasky Kok.
+
 - Issue #21522: Added Tkinter tests for Listbox.itemconfigure(),
   PanedWindow.paneconfigure(), and Menu.entryconfigure().