Various fixes for test_genutils under win32, now all tests pass.

IPython/utils/genutils.py

@@ -778,6 +778,7 b' def get_home_dir():'
 
     * On POSIX, we try $HOME.
     * On Windows we try:
+      - %HOME%: rare, but some people with unix-like setups may have defined it
       - %HOMESHARE%
       - %HOMEDRIVE\%HOMEPATH%
       - %USERPROFILE%
@@ -820,7 +821,12 b' def get_home_dir():'
         # is needed when running IPython on cluster where all paths have to 
         # be UNC.
         try:
-            homedir = env['HOMESHARE']
+            # A user with a lot of unix tools in win32 may have defined $HOME,
+            # honor it if it exists, but otherwise let the more typical
+            # %HOMESHARE% variable be used.
+            homedir = env.get('HOME')
+            if homedir is None:
+                homedir = env['HOMESHARE']
         except KeyError:
             pass
         else:

IPython/utils/tests/test_genutils.py

@@ -93,8 +93,9 b' def setup_environment():'
     if os.name == 'nt':
         platformstuff = (wreg.OpenKey, wreg.QueryValueEx,)
 
-    if 'IPYTHONDIR' in env:
-        del env['IPYTHONDIR']
+    # Remove both spellings of env variables if present
+    env.pop('IPYTHON_DIR', None)
+    env.pop('IPYTHONDIR', None)
 
 def teardown_environment():
     """Restore things that were remebered by the setup_environment function
@@ -191,12 +192,14 b' def test_get_home_dir_6():'
 @skip_if_not_win32
 @with_environment
 def test_get_home_dir_7():
-    """Testcase $HOME is not set, os=='nt' 
-    env['HOMEDRIVE'],env['HOMEPATH'], env['USERPROFILE'] missing
+    """Testcase $HOME is not set, os=='nt'
+    
+    env['HOMEDRIVE'],env['HOMEPATH'], env['USERPROFILE'] and others missing
     """
     os.name = 'nt'
-    if 'HOME' in env: del env['HOME']
-    if 'HOMEDRIVE' in env: del env['HOMEDRIVE']
+    # Remove from stub environment all keys that may be set
+    for key in ['HOME', 'HOMESHARE', 'HOMEDRIVE', 'HOMEPATH', 'USERPROFILE']:
+        env.pop(key, None)
 
     #Stub windows registry functions
     def OpenKey(x, y):
@@ -220,7 +223,7 b' def test_get_home_dir_7():'
 @with_environment
 def test_get_ipython_dir_1():
     """test_get_ipython_dir_1, Testcase to see if we can call get_ipython_dir without Exceptions."""
-    env['IPYTHONDIR'] = "someplace/.ipython"
+    env['IPYTHON_DIR'] = "someplace/.ipython"
     ipdir = genutils.get_ipython_dir()
     nt.assert_equal(ipdir, "someplace/.ipython")