- tor-commits - lists.torproject.org

[ooni-probe/master] Remove reference to install.rst
by art＠torproject.org 02 Dec '12

02 Dec '12

commit c2dc0cd5ea8d64113e79ca1eb25c3001146f7f31 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 15:59:48 2012 +0000 Remove reference to install.rst * Installation instructions are now in README.md --- docs/source/index.rst | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index a6687d9..497385b 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -119,7 +119,6 @@ More developer documentation :glob: oonib - install writing_tests api/* glossary

1 0

[ooni-probe/master] Make docstring work with sphinx
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 416256bf99fc2c53f721451f03a4a9b88a5c2842 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 17:21:26 2012 +0000 Make docstring work with sphinx --- ooni/nettest.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 4a54414..5e62adb 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -159,7 +159,7 @@ class NetTestCase(object): that you will be able to properly process. For example you may wish to have an input processor that will allow you - to ignore comments in files. This can be easily achieved like so: + to ignore comments in files. This can be easily achieved like so:: fp = open(filename) for x in fp.xreadlines():

1 0

[ooni-probe/master] Make docstring work with sphinx
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 045b9f04d7dd2cc24aa3bd396459bb5e400ff5f7 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 17:26:20 2012 +0000 Make docstring work with sphinx --- ooni/templates/httpt.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 01853f3..eb574be 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -176,7 +176,7 @@ class HTTPTest(NetTestCase): Note: if self.followRedirects is set to True, then this method will never be called. XXX perhaps we may want to hook _handleResponse in RedirectAgent to - call processRedirect every time we get redirected. + call processRedirect every time we get redirected. Args:

1 0

[ooni-probe/master] Add newline to please the Sphinx
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 5acfd8072b3f1dff89b3bf7f1f01a15951d72fe1 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 17:31:11 2012 +0000 Add newline to please the Sphinx --- ooni/templates/scapyt.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index a787115..8e6ce9c 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -24,7 +24,8 @@ class BaseScapyTest(NetTestCase): report: sent_packets: [{'raw_packet': BASE64Encoding of packet, - 'summary': 'IP / TCP 192.168.2.66:ftp_data > 8.8.8.8:http S'] + 'summary': 'IP / TCP 192.168.2.66:ftp_data > 8.8.8.8:http S'}] + answered_packets: [] """

1 0

[ooni-probe/master] Prune kit from docs
by art＠torproject.org 02 Dec '12

02 Dec '12

commit a8c6998acfb3e25653cd2b4b706c49332d71ece8 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 18:03:04 2012 +0000 Prune kit from docs --- docs/source/api/ooni.kit.rst | 19 ------------------- docs/source/api/ooni.rst | 1 - ooni/kit/__init__.py | 1 + 3 files changed, 1 insertions(+), 20 deletions(-) diff --git a/docs/source/api/ooni.kit.rst b/docs/source/api/ooni.kit.rst deleted file mode 100644 index d870355..0000000 --- a/docs/source/api/ooni.kit.rst +++ /dev/null @@ -1,19 +0,0 @@ -kit Package -=========== - -:mod:`kit` Package ------------------- - -.. automodule:: ooni.kit - :members: - :undoc-members: - :show-inheritance: - -:mod:`domclass` Module ----------------------- - -.. automodule:: ooni.kit.domclass - :members: - :undoc-members: - :show-inheritance: - diff --git a/docs/source/api/ooni.rst b/docs/source/api/ooni.rst index 8e133a3..83b4f83 100644 --- a/docs/source/api/ooni.rst +++ b/docs/source/api/ooni.rst @@ -62,7 +62,6 @@ Subpackages .. toctree:: - ooni.kit ooni.lib ooni.templates ooni.utils diff --git a/ooni/kit/__init__.py b/ooni/kit/__init__.py index 55374c9..9a24fae 100644 --- a/ooni/kit/__init__.py +++ b/ooni/kit/__init__.py @@ -1 +1,2 @@ __all__ = ['domclass'] +from . import domclass

1 0

[ooni-probe/master] Fix title level inconsistency
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 2328be4c64d1d8da3f6fb19184979e726d4aa9a1 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 18:19:28 2012 +0000 Fix title level inconsistency --- docs/source/index.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 497385b..45b2f7c 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -95,7 +95,7 @@ collected from ooniprobes and it will run a series of Test Helpers that assist `Traffic Manipulation`_ in performing their measurements. Test Helpers -............ +------------ The currently implemented test helpers are the following: @@ -112,7 +112,7 @@ The currently implemented test helpers are the following: <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/d…>`_ More developer documentation -***************************** +**************************** .. toctree:: :maxdepth: 2

1 0

[ooni-probe/master] Fix reference to Traffic Manipulation Tests
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 1093c747875c2f5346e9160f92329c68ddd662bb Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 18:24:49 2012 +0000 Fix reference to Traffic Manipulation Tests --- docs/source/index.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 45b2f7c..70cb99c 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -92,7 +92,7 @@ oonib This is the server side component of ooniprobe. It will store that data collected from ooniprobes and it will run a series of Test Helpers that assist -`Traffic Manipulation`_ in performing their measurements. +`Traffic Manipulation Tests`_ in performing their measurements. Test Helpers ------------

1 0

[ooni-probe/master] Add default _static dir
by art＠torproject.org 02 Dec '12

02 Dec '12

commit ae388acc092b22ffdcc123ef90e4323c9160986f Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 18:31:32 2012 +0000 Add default _static dir --- docs/source/_static/.gitignore | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/docs/source/_static/.gitignore b/docs/source/_static/.gitignore new file mode 100644 index 0000000..5e7d273 --- /dev/null +++ b/docs/source/_static/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore

1 0

[ooni-probe/master] Fix experimental test links
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 3a87fea92e6f6d0314d6c280eb781ad7addf57b8 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Nov 30 18:50:57 2012 +0000 Fix experimental test links --- docs/source/index.rst | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 70cb99c..770133d 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -76,16 +76,20 @@ Other tests We also have some other tests that are currently not fully supported or still being experimented with. -You can find these in ::`nettests/experimental: -https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/experimental`. +You can find these in: -Tests that don't do a measurement but are useful for scanning can be found in -::`nettests/scanning: -https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/scanning`. + * `nettests/experimental + <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/experiment…>`_ -Tests that involve running third party tools may be found in -::`nettests/third_party: -https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/third_party`. +Tests that don't do a measurement but are useful for scanning can be found in: + + * `nettests/scanning + <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/scanning>`_ + +Tests that involve running third party tools may be found in: + + * `nettests/third_party + <https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/third_party>`_ oonib ***** @@ -122,5 +126,3 @@ More developer documentation writing_tests api/* glossary - - diff --git a/docs/source/intro.rst b/docs/source/intro.rst deleted file mode 100644 index e69de29..0000000

1 0

[ooni-probe/master] Merge pull request #13 from aagbsn/update_docs
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 6e1aa8152bd4530a69278e13605e9f6dab583a61 Merge: 12469db 3a87fea Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Nov 30 17:20:44 2012 -0800 Merge pull request #13 from aagbsn/update_docs Update docs docs/source/_static/.gitignore | 4 +++ docs/source/api/ooni.kit.rst | 19 --------------- docs/source/api/ooni.lib.rst | 26 -------------------- docs/source/api/ooni.rst | 5 +-- docs/source/api/ooni.utils.rst | 23 +++++------------ docs/source/index.rst | 29 ++++++++++++----------- docs/source/tests/http_invalid_request_line.rst | 2 +- ooni/kit/__init__.py | 1 + ooni/nettest.py | 2 +- ooni/templates/httpt.py | 2 +- ooni/templates/scapyt.py | 3 +- 11 files changed, 34 insertions(+), 82 deletions(-)

1 0