commit 6b90972dc6c13a252368faf5aa8003a89495a96e parent 9767cf8cc091d0c9dd062fbfce258188841ec331 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 24 Sep 2018 11:25:39 -0400 Merge branch 'pr_339_squashed' Diffstat:
| A | changes/doc27677 | | | 4 | ++++ |
| M | doc/HACKING/WritingTests.md | | | 4 | ++-- |
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/changes/doc27677 b/changes/doc27677 @@ -0,0 +1,4 @@ + o Documentation: + - Mention that we require Python to be 2.7 or newer for + integration tests that we ship with Tor. Resolves ticket + 27677. diff --git a/doc/HACKING/WritingTests.md b/doc/HACKING/WritingTests.md @@ -7,8 +7,8 @@ keep from introducing bugs. The major ones are: 1. Unit tests written in C and shipped with the Tor distribution. - 2. Integration tests written in Python and shipped with the Tor - distribution. + 2. Integration tests written in Python 2 (>= 2.7) or Python 3 + (>= 3.1) and shipped with the Tor distribution. 3. Integration tests written in Python and shipped with the Stem library. Some of these use the Tor controller protocol.