Merge remote-tracking branch 'upstream/master' into zope4py2

software/headless-chromium/buildout.hash.cfg

@@ -11,5 +11,5 @@ _update_hash_filename_ = templates/nginx.conf.in
 md5sum = 1f35f91fa7e490cd1e2194264a8a6ed8
 
 [template-mime-types]
-_update_hash_filename_ = templates/mime-types.in
+_update_hash_filename_ = templates/mime_types.in
 md5sum = 4ef94a7b458d885cd79ba0b930a5727e

software/slapos-sr-testing/README.md

@@ -56,6 +56,7 @@ The `environment-script` set all variables except `SLAPOS_TEST_DEBUG`, `SLAPOS_T
 | `SLAPOS_TEST_IPV4` | ipv4 used by this instance. |
 | `SLAPOS_TEST_WORKING_DIR` | Path to use as a working directory to hold the standalone SlapOS. |
 | `SLAPOS_TEST_SHARED_PART_LIST` | A `:` separated of paths to look for already installed shared parts. The SlapOS used in the test will not write in these, but will use a dedicated directory in `$SLAPOS_TEST_WORKING_DIR` |
+| `SLAPOS_TEST_LOG_DIRECTORY` | If set, slapos testing will save a snapshot of the instance and/or software files in there in case of failure. Mostly used in testnodes to be able to debug afterward. Note that this directory is expected to be empty for each test. |
 
 
 ## Frequently Asked Questions