[tor-commits] [stem/master] Merge branch 'metrics-lib'

[atagar at torproject.org]

commit bc0e578615d9a856ab9052acc5a116774c49d133
Merge: 989fd95 975d98d
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Mar 25 17:09:21 2012 -0700

    Merge branch 'metrics-lib'

 run_tests.py                                       |   12 +
 stem/__init__.py                                   |    2 +-
 stem/descriptor/__init__.py                        |   87 +++
 stem/descriptor/reader.py                          |  418 ++++++++++++++
 stem/descriptor/server_descriptor.py               |  574 ++++++++++++++++++++
 stem/socket.py                                     |    2 +-
 stem/util/__init__.py                              |    2 +-
 stem/util/connection.py                            |   56 ++
 stem/util/tor_tools.py                             |   51 ++
 test/integ/connection/authentication.py            |    2 +-
 test/integ/descriptor/__init__.py                  |    6 +
 test/integ/descriptor/data/descriptor_archive.tar  |  Bin 0 -> 20480 bytes
 .../descriptor/data/descriptor_archive.tar.bz2     |  Bin 0 -> 3322 bytes
 .../descriptor/data/descriptor_archive.tar.gz      |  Bin 0 -> 2844 bytes
 test/integ/descriptor/data/example_descriptor      |   30 +
 test/integ/descriptor/data/riddle                  |   20 +
 test/integ/descriptor/data/tiny.png                |  Bin 0 -> 188 bytes
 test/integ/descriptor/reader.py                    |  410 ++++++++++++++
 test/integ/descriptor/server_descriptor.py         |  133 +++++
 test/mocking.py                                    |   41 ++-
 test/runner.py                                     |   10 +-
 test/unit/descriptor/__init__.py                   |    6 +
 test/unit/descriptor/reader.py                     |   96 ++++
 test/unit/descriptor/server_descriptor.py          |  276 ++++++++++
 test/unit/util/__init__.py                         |    2 +-
 test/unit/util/connection.py                       |   51 ++
 test/unit/util/tor_tools.py                        |   55 ++
 27 files changed, 2331 insertions(+), 11 deletions(-)