Merge lp:~jspashett/bzr/missing_win32api_for_test into lp:bzr

[Jason Spashett]

Skip test_wordpad on win32 when the win32api is not present.

Test test_wordpad requires win32api module which isn't present on my system hence the test failes.
Added a feature requirement for this test to skip it if win32api not present.

This test calls get_app_path which is what requires win32api.

[Martin Packman (gz)]

sent to pqm by email

=== modified file 'bzrlib/tests/test_win32utils.py'
--- bzrlib/tests/test_win32utils.py	2010-05-20 02:57:52 +0000
+++ bzrlib/tests/test_win32utils.py	2010-06-22 17:30:49 +0000
@@ -54,6 +54,7 @@
 Win32RegistryFeature = _RequiredModuleFeature('_winreg')
 CtypesFeature = _RequiredModuleFeature('ctypes')
 Win32comShellFeature = _RequiredModuleFeature('win32com.shell')
+Win32ApiFeature = _RequiredModuleFeature('win32api') 
 
 
 # Tests
@@ -189,6 +190,7 @@
         # typical windows users should have wordpad in the system
         # but there is problem: its path has the format REG_EXPAND_SZ
         # so naive attempt to get the path is not working
+        self.requireFeature(Win32ApiFeature)
         for a in ('wordpad', 'wordpad.exe'):
             p = get_app_path(a)
             d, b = os.path.split(p)