Rev 5316: (gz) Skip test_wordpad on win32 when the win32api is not present. (Jason in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5316 [merge]
revision-id: pqm at pqm.ubuntu.com-20100622235834-85ugj691i2o5sxno
parent: pqm at pqm.ubuntu.com-20100622224029-uycecuqjhtzi4onm
parent: jason at spashett.com-20100622125317-yx8muhjvo931nu5t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-06-23 00:58:34 +0100
message:
  (gz) Skip test_wordpad on win32 when the win32api is not present. (Jason
   Spashett)
modified:
  bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
=== modified file 'bzrlib/tests/test_win32utils.py'
--- a/bzrlib/tests/test_win32utils.py	2010-06-22 00:52:51 +0000
+++ b/bzrlib/tests/test_win32utils.py	2010-06-22 23:58:34 +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)