From eb68ec75aa491cf164e4bdcf130d9c5a6630bad6 Mon Sep 17 00:00:00 2001
From: hpk <none@none>
Date: Wed, 18 Mar 2009 20:23:52 +0100
Subject: [PATCH] [svn r63052] some fixes for win32

--HG--
branch : trunk
---
 py/cmdline/testing/test_generic.py | 6 +++++-
 py/rest/testing/test_rst.py        | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/py/cmdline/testing/test_generic.py b/py/cmdline/testing/test_generic.py
index 2f7eaa657..9267eeb2d 100644
--- a/py/cmdline/testing/test_generic.py
+++ b/py/cmdline/testing/test_generic.py
@@ -30,7 +30,11 @@ def checkprocess(script):
             cmd += " sys"
         print "executing", script
         try:
-            py.process.cmdexec(cmd)
+            old = script.dirpath().chdir()
+            try:
+                py.process.cmdexec(cmd)
+            finally:
+                old.chdir()
         except py.process.cmdexec.Error, e:
             if cmd.find("py.rest") != -1 and \
                e.out.find("module named") != -1:
diff --git a/py/rest/testing/test_rst.py b/py/rest/testing/test_rst.py
index 2dfbd5b8c..7f03f502f 100644
--- a/py/rest/testing/test_rst.py
+++ b/py/rest/testing/test_rst.py
@@ -1,7 +1,8 @@
 
 """ rst generation tests
 """
-
+import py
+py.test.importorskip("docutils")
 from py.__.rest.rst import *
 from py.__.misc.rest import process as restcheck
 import traceback