Merged in anthon_van_der_neut/tox (pull request #53)

fix for #108

2 files changed, 45 insertions, 1 deletions

diff --git a/doc/example/general.txt b/doc/example/general.txt
index 296036f..7179a87 100644
--- a/doc/example/general.txt
+++ b/doc/example/general.txt
@@ -122,7 +122,7 @@ strings which must be compliant with :pep:`386`.
 
 If you want to use this with Jenkins_, also checkout the :ref:`jenkins artifact example`.
 
-.. _verlib: http://bitbucket.org/tarek/distutilsversion/
+.. _verlib: https://bitbucket.org/tarek/distutilsversion/
 
 basepython defaults, overriding
 ++++++++++++++++++++++++++++++++++++++++++
diff --git a/doc/example/result.txt b/doc/example/result.txt
new file mode 100644
index 0000000..b3b95b4
--- /dev/null
+++ b/doc/example/result.txt
@@ -0,0 +1,44 @@
+
+Writing a json result file
+--------------------------------------------------------
+
+.. versionadded: 1.6
+
+You can instruct tox to write a json-report file via::
+
+    tox --result-json=PATH
+
+This will create a json-formatted result file using this schema::
+
+    {
+      "testenvs": {
+        "py27": {
+          "python": {
+            "executable": "/home/hpk/p/tox/.tox/py27/bin/python", 
+            "version": "2.7.3 (default, Aug  1 2012, 05:14:39) \n[GCC 4.6.3]", 
+            "version_info": [ 2, 7, 3, "final", 0 ]
+          }, 
+          "test": [
+            {
+              "output": "...",
+              "command": [
+                "/home/hpk/p/tox/.tox/py27/bin/py.test", 
+                "--instafail", 
+                "--junitxml=/home/hpk/p/tox/.tox/py27/log/junit-py27.xml", 
+                "tests/test_config.py"
+              ], 
+              "retcode": "0"
+            }
+          ], 
+          "setup": []
+        }
+      }, 
+      "platform": "linux2", 
+      "installpkg": {
+        "basename": "tox-1.6.0.dev1.zip", 
+        "sha256": "b6982dde5789a167c4c35af0d34ef72176d0575955f5331ad04aee9f23af4326", 
+        "md5": "27ead99fd7fa39ee7614cede6bf175a6"
+      }, 
+      "toxversion": "1.6.0.dev1", 
+      "reportversion": "1"
+    }