[tor-commits] [tlsdate/master] Merge pull request #116 from elly/integration

[ioerror at torproject.org]

commit 55da3fadccab99150a95445df198ae0ef030ca83
Merge: ce042c6 234454e
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Mon Jul 8 09:02:24 2013 -0700

    Merge pull request #116 from elly/integration
    
    Add integration testing.

 run-tests                      |   40 ++++++++++++++++++++++++++++++++++++++++
 test.conf                      |    2 ++
 tests/README                   |    1 +
 tests/common.sh                |   32 ++++++++++++++++++++++++++++++++
 tests/run-idle/output          |    1 +
 tests/run-idle/runs            |    1 +
 tests/run-idle/setup           |    4 ++++
 tests/run-idle/subproc.sh      |    6 ++++++
 tests/run-idle/teardown        |    4 ++++
 tests/run-idle/test.conf       |    2 ++
 tests/run-once/output          |    1 +
 tests/run-once/run-error       |    1 +
 tests/run-once/subproc.sh      |    5 +++++
 tests/run-routeup/input        |    1 +
 tests/run-routeup/output       |    1 +
 tests/run-routeup/runs         |    1 +
 tests/run-routeup/setup        |    4 ++++
 tests/run-routeup/subproc.sh   |    6 ++++++
 tests/run-routeup/teardown     |    4 ++++
 tests/subproc-retry/input      |    1 +
 tests/subproc-retry/output     |    3 +++
 tests/subproc-retry/runs       |    1 +
 tests/subproc-retry/setup      |    4 ++++
 tests/subproc-retry/subproc.sh |   10 ++++++++++
 tests/subproc-retry/teardown   |    4 ++++
 tests/wait-idle/subproc.sh     |    7 +++++++
 26 files changed, 147 insertions(+)