svn commit: r920277 - /subversion/trunk/subversion/tests/cmdline/update_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Mon Mar  8 11:34:22 2010
New Revision: 920277

URL: http://svn.apache.org/viewvc?rev=920277&view=rev
Log:
* update_tests.py
  (update_wc_on_windows_drive):
    Add early bailout if not on Windows and add a workaround for when
    the win32api python import is not available (like on some x64 installs).

Modified:
    subversion/trunk/subversion/tests/cmdline/update_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=920277&r1=920276&r2=920277&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Mon Mar  8 11:34:22 2010
@@ -2208,10 +2208,18 @@
         if not drive + ':\\' in drives:
           return drive
     except ImportError:
-      return None
+      # In ActiveState python x64 win32api is not available
+      for d in range(ord('G'), ord('Z')+1):
+        drive = chr(d)
+        if not os.path.isdir(drive + ':\\'):
+          return drive
 
     return None
 
+  # Skip the test if not on Windows
+  if not svntest.main.windows:
+    raise svntest.Skip
+
   # just create an empty folder, we'll checkout later.
   sbox.build(create_wc = False)
   svntest.main.safe_rmtree(sbox.wc_dir)