BIND 10 master, updated. 451d16ebbbf619ad5b420b7a837bf95ec23ab686 [master] Merge branch 'trac2583'

[BIND 10 source code commits]

The branch, master has been updated
       via  451d16ebbbf619ad5b420b7a837bf95ec23ab686 (commit)
       via  4660c86fe6aeb2c77427ca8cacd1b7f840d4e554 (commit)
      from  954430281cec4d8f6382285f761a1859ca9508f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 451d16ebbbf619ad5b420b7a837bf95ec23ab686
Merge: 9544302 4660c86
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Mar 25 16:27:28 2013 +0100

    [master] Merge branch 'trac2583'

-----------------------------------------------------------------------

Summary of changes:
 tests/lettuce/README                      |    5 +++++
 tests/lettuce/features/terrain/terrain.py |    8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/README b/tests/lettuce/README
index 94bf82b..a53c6e7 100644
--- a/tests/lettuce/README
+++ b/tests/lettuce/README
@@ -70,6 +70,11 @@ These files *will* be overwritten or deleted if the same scenarios are run
 again, so if you want to inspect them after a failed test, either do so
 immediately or move the files.
 
+If you want to keep these output files even for successful runs, you can
+specify the environment variable LETTUCE_KEEP_OUTPUT=1. The files will
+still be overwritten by subsequent runs, but they will not automatically be
+deleted.
+
 Adding and extending tests
 --------------------------
 
diff --git a/tests/lettuce/features/terrain/terrain.py b/tests/lettuce/features/terrain/terrain.py
index 67ca802..2f01723 100644
--- a/tests/lettuce/features/terrain/terrain.py
+++ b/tests/lettuce/features/terrain/terrain.py
@@ -26,12 +26,16 @@
 
 from lettuce import *
 import subprocess
-import os.path
+import os
 import shutil
 import re
 import sys
 import time
 
+# lettuce cannot directly pass commands to the terrain, so we need to
+# use environment variables to influence behaviour
+KEEP_OUTPUT = 'LETTUCE_KEEP_OUTPUT'
+
 # In order to make sure we start all tests with a 'clean' environment,
 # We perform a number of initialization steps, like restoring configuration
 # files, and removing generated data files.
@@ -109,7 +113,7 @@ class RunningProcess:
         self.process = None
         self.step = step
         self.process_name = process_name
-        self.remove_files_on_exit = True
+        self.remove_files_on_exit = (os.environ.get(KEEP_OUTPUT) != '1')
         self._check_output_dir()
         self._create_filenames()
         self._start_process(args)