commit bc37c95d4d8168214f826f8313b976e278982b47 Merge: f1a1558 a282749 Author: Arturo Filastò art@fuffa.org Date: Wed Aug 13 18:50:32 2014 +0200

Merge remote-tracking branch 'kudrom/fix/typos'

* kudrom/fix/typos: Fix typos and section numbers

Conflicts: test-decks/td-spec.md

test-decks/td-spec.md | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)

diff --cc test-decks/td-spec.md index bec5e9e,e74f91f..d73ae1c --- a/test-decks/td-spec.md +++ b/test-decks/td-spec.md @@@ -112,17 -112,9 +112,17 @@@ body - nettest: manipulation/captiveportal ```

+All file paths must be relative and they must start with "deck/" if they are +referring to files contained inside of the test deck. They must start with +"http(o|s)://" if they are referring to files to be downloaded via Tor. + +All other file paths should be ignored and raise an exception. This is because +we do not want an analyst creating a deck to be pass as arguments to a test +arbitrary files on the testers filesystem. + - # 3. Implementation details + # 4. Implementation details

- ## 3.1 Introduction + ## 4.1 Introduction

Each execution of a nettest in ooniprobe needs four main inputs.