From 3e9f23a67d8f7553e6fdd0ab09d7c209f75fd413 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sat, 18 Apr 2009 21:59:07 -0400
Subject: Make the farm tests more isolated by forcing them to erase coverage
 data first.

---
 test/farm/annotate/annotate_dir.py |  3 +--
 test/farm/annotate/run.py          |  2 +-
 test/farm/annotate/run_multi.py    | 11 +++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/farm/annotate/annotate_dir.py b/test/farm/annotate/annotate_dir.py
index 23dfff30..3e37f9ed 100644
--- a/test/farm/annotate/annotate_dir.py
+++ b/test/farm/annotate/annotate_dir.py
@@ -1,8 +1,7 @@
 copy("src", "run")
 run("""
-    coverage -x multi.py
+    coverage -e -x multi.py
     coverage -a -d out_anno_dir
     """, rundir="run")
 compare("run/out_anno_dir", "gold_anno_dir", "*,cover", left_extra=True)
-clean("out_anno_dir")
 clean("run")
diff --git a/test/farm/annotate/run.py b/test/farm/annotate/run.py
index 8ecfce89..c645f21c 100644
--- a/test/farm/annotate/run.py
+++ b/test/farm/annotate/run.py
@@ -1,6 +1,6 @@
 copy("src", "out")
 run("""
-    coverage -x white.py
+    coverage -e -x white.py
     coverage -a white.py
     """, rundir="out")
 compare("out", "gold", "*,cover")
diff --git a/test/farm/annotate/run_multi.py b/test/farm/annotate/run_multi.py
index 586aa36c..872f0976 100644
--- a/test/farm/annotate/run_multi.py
+++ b/test/farm/annotate/run_multi.py
@@ -1,8 +1,7 @@
-outdir = "out_multi"
-copy("src", outdir)
+copy("src", "out_multi")
 run("""
-    coverage -x multi.py
+    coverage -e -x multi.py
     coverage -a 
-    """, rundir=outdir)
-compare(outdir, "gold_multi", "*,cover")
-clean(outdir)
+    """, rundir="out_multi")
+compare("out_multi", "gold_multi", "*,cover")
+clean("out_multi")
-- 
cgit v1.2.1