debug testlib if pytest started with no restart or exitfirst option

1 files changed, 13 insertions, 13 deletions

diff --git a/testlib.py b/testlib.py
index 674cf45..1519111 100644
--- a/testlib.py
+++ b/testlib.py
@@ -850,21 +850,21 @@ Examples:
                         if descr in succTests:
                             obj.remove(el)
 
-        # retrieve succeeded tests from FILE_RESTART
-        try:
-            restartfile = open(FILE_RESTART, 'r')
+        if self.options.restart:
+            # retrieve succeeded tests from FILE_RESTART
             try:
-                succeededtests = list(elem.rstrip('\n\r') for elem in 
-                    restartfile.readlines())
-                removeSucceededTests(self.test, succeededtests)
-            except Exception, e:
-                raise e
-            finally:
-                restartfile.close()
-        except Exception ,e:
-            print >> sys.__stderr__, "Error while reading \
+                restartfile = open(FILE_RESTART, 'r')
+                try:
+                    succeededtests = list(elem.rstrip('\n\r') for elem in 
+                        restartfile.readlines())
+                    removeSucceededTests(self.test, succeededtests)
+                except Exception, e:
+                    raise e
+                finally:
+                    restartfile.close()
+            except Exception ,e:
+                raise "Error while reading \
 succeeded tests into", osp.join(os.getcwd(),FILE_RESTART)
-            raise e
 
         result = self.testRunner.run(self.test)
         if hasattr(self.module, 'teardown_module'):