[tor-commits] [ooni-probe/master] Merge pull request #546 from TheTorProject/feature/cloud-fronted-collectors

[art at torproject.org]

commit 5f8a23aa32e4f2e393863f86ac9a74f7611acaf8
Merge: d47aaff 81ec18e
Author: Arturo Filastò <arturo at filasto.net>
Date:   Fri Jul 1 17:26:10 2016 +0200

    Merge pull request #546 from TheTorProject/feature/cloud-fronted-collectors
    
    Feature/cloud fronted collectors

 data/ooniprobe.conf.sample        |   3 +
 ooni/__init__.py                  |   2 +-
 ooni/backend_client.py            |  39 +++----
 ooni/constants.py                 |   7 ++
 ooni/deck.py                      | 112 ++++++++++++--------
 ooni/errors.py                    |   4 +
 ooni/oonicli.py                   |  20 +++-
 ooni/tests/bases.py               |  10 +-
 ooni/tests/mocks.py               |   9 ++
 ooni/tests/test_backend_client.py | 217 ++++++++++++++++++++++++++++++++++++++
 ooni/tests/test_deck.py           |  72 +++++++++++--
 ooni/tests/test_director.py       |   1 -
 ooni/tests/test_nettest.py        |   4 +-
 ooni/tests/test_oonibclient.py    | 144 -------------------------
 requirements.txt                  |   3 +-
 15 files changed, 419 insertions(+), 228 deletions(-)