merged AutomatedTests.md

developers/VersionScheme.md

@@ -64,7 +64,7 @@ The next RC is released five weeks after the former. All packets are published
 in `current` repository and the cycle starts over. There should be no less than
 1 and no more than 3 release candidates before final release.
 
-<table>
+<table border>
     <thead>
         <tr><th>stage</th><th>time</th></tr>
     </thead>
@@ -81,6 +81,8 @@ should be another RC. If, based on remaining issues, the Committee decides to
 release final, then the Committee agrees upon the release date, which should be
 no later than a week after.
 
+!["Release cycle"](/attachment/wiki/VersionScheme/release-cycle.svg)
+
 Bug priorities
 --------------
 

developers/debugging/AutomatedTests.md

@@ -7,7 +7,7 @@ permalink: /doc/AutomatedTests/
 Automatic tests
 ===============
 
-Starting with Qubes R3 we use [python unittest](TODO) to perform automatic
+Starting with Qubes R3 we use [python unittest][unittest] to perform automatic
 tests of Qubes OS. Regardless of the name, we use it for both [unit
 tests](https://en.wikipedia.org/wiki/Unit_tests) and [integration
 tests](https://en.wikipedia.org/wiki/Integration_tests). The main purpose is of
@@ -95,6 +95,9 @@ For example to run only tests for fedora-21 template, you can use `-l` option, t
     vm_qrexec_gui/TC_20_DispVM_fedora-21/test_030_edit_file
     [user@dom0 ~]$ python -m qubes.tests.run -v `python -m qubes.tests.run -l | grep fedora-21`
 
+Example test run:
+
+![snapshot-tests2.png](/attachment/wiki/developers/snapshot-tests2.png)
 
 ## Adding a new test to core-admin
 After you added a new unit test to [core-admin/tests](https://github.com/QubesOS/qubes-core-admin/tree/master/tests) 
@@ -126,4 +129,10 @@ Add at the bottom of the file in the method `def load_tests` to the variable
             'qubes.tests.regressions',
             'qubes.tests.example', # This is our newly added test
             ):
+<<<<<<< HEAD
 ~~~
+=======
+```
+
+[unittest]: https://docs.python.org/2/library/unittest.html
+>>>>>>> upstream/master