November 2012 - tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 08 Nov '12

08 Nov '12

commit cbe8752aa68579b2913dc039c9703468d5eaf341 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 8 17:45:18 2012 +0000 Update translations for vidalia_alpha --- lv/vidalia_lv.po | 58 +++++++++++++++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 4fe0064..c7c5d28 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-08 15:25+0000\n" +"PO-Revision-Date: 2012-11-08 17:43+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3317,7 +3317,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Tor programmatūras kļūda" msgctxt "StatusEventWidget" msgid "" @@ -3374,7 +3374,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "Nezināms SOCKS protokols" msgctxt "StatusEventWidget" msgid "" @@ -3396,7 +3396,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "Ārēja IP adrese ir nomainīta" msgctxt "StatusEventWidget" msgid "" @@ -3497,7 +3497,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Relay is Online" -msgstr "" +msgstr "Jūsu retranslators ir tiešsaistē" msgctxt "StatusEventWidget" msgid "" @@ -3671,7 +3671,7 @@ msgstr "" msgctxt "UPNPControl" msgid "WSAStartup failed" -msgstr "" +msgstr "WSAStartup neizdevās" msgctxt "UPNPControl" msgid "Failed to add a port mapping" @@ -3687,7 +3687,7 @@ msgstr "" msgctxt "UPNPControl" msgid "Unknown error" -msgstr "" +msgstr "Nezināma kļūda" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" @@ -3707,7 +3707,7 @@ msgstr "" msgctxt "UPNPTestDialog" msgid "Testing UPnP Support" -msgstr "" +msgstr "Pārbauda UPnP atbalstu" msgctxt "UPNPTestDialog" msgid "Testing Universal Plug & Play Support" @@ -3731,7 +3731,7 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "Hide" -msgstr "" +msgstr "Paslēpt" msgctxt "UpdateProgressDialog" msgid "Downloading updates..." @@ -3747,7 +3747,7 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "OK" -msgstr "" +msgstr "Labi" msgctxt "UpdateProgressDialog" msgid "Software Updates" @@ -3759,7 +3759,7 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "Cancel" -msgstr "" +msgstr "Atcelt" msgctxt "UpdatesAvailableDialog" msgid "Software Updates Available" @@ -3771,7 +3771,7 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Install" -msgstr "" +msgstr "Instalēt" msgctxt "UpdatesAvailableDialog" msgid "The following updated software packages are ready for installation:" @@ -3779,31 +3779,31 @@ msgstr "" msgctxt "UpdatesAvailableDialog" msgid "Package" -msgstr "" +msgstr "Pakotne" msgctxt "UpdatesAvailableDialog" msgid "Version" -msgstr "" +msgstr "Versija" msgctxt "VMessageBox" msgid "OK" -msgstr "" +msgstr "Labi" msgctxt "VMessageBox" msgid "Cancel" -msgstr "" +msgstr "Atcelt" msgctxt "VMessageBox" msgid "Yes" -msgstr "" +msgstr "Jā" msgctxt "VMessageBox" msgid "No" -msgstr "" +msgstr "Nē" msgctxt "VMessageBox" msgid "Help" -msgstr "" +msgstr "Palīdzība" msgctxt "VMessageBox" msgid "Retry" @@ -3811,23 +3811,23 @@ msgstr "" msgctxt "VMessageBox" msgid "Show Log" -msgstr "" +msgstr "Rādīt žurnālu" msgctxt "VMessageBox" msgid "Show Settings" -msgstr "" +msgstr "Rādīt iestatījumus" msgctxt "VMessageBox" msgid "Continue" -msgstr "" +msgstr "Turpināt" msgctxt "VMessageBox" msgid "Quit" -msgstr "" +msgstr "Beigt" msgctxt "VMessageBox" msgid "Browse" -msgstr "" +msgstr "Pārlūkot" msgctxt "Vidalia" msgid "Invalid Argument" @@ -3902,23 +3902,23 @@ msgstr "" msgctxt "stringutil.h" msgid "%1 secs" -msgstr "" +msgstr "%1 secs" msgctxt "stringutil.h" msgid "%1 B/s" -msgstr "" +msgstr "%1 B/s" msgctxt "stringutil.h" msgid "%1 KB/s" -msgstr "" +msgstr "%1 KB/s" msgctxt "stringutil.h" msgid "%1 MB/s" -msgstr "" +msgstr "%1 MB/s" msgctxt "stringutil.h" msgid "%1 GB/s" -msgstr "" +msgstr "%1 GB/s" msgctxt "stringutil.h" msgid "%1 days"

1 0

[torspec/master] Add "geoip6-db-digest" and "bridge-ip-versions".
by nickm＠torproject.org 08 Nov '12

08 Nov '12

commit e873cfa9c771a8fd7f67ac56fd2f04aa67cbd320 Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Oct 19 23:23:04 2012 +0200 Add "geoip6-db-digest" and "bridge-ip-versions". --- dir-spec.txt | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index e98b603..39edc0f 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -620,8 +620,14 @@ "geoip-db-digest" Digest NL [At most once.] - SHA1 digest of the GeoIP database file that is used to resolve IP - addresses to country codes. + SHA1 digest of the IPv4 GeoIP database file that is used to + resolve IPv4 addresses to country codes. + + "geoip6-db-digest" Digest NL + [At most once.] + + SHA1 digest of the IPv6 GeoIP database file that is used to + resolve IPv6 addresses to country codes. ("geoip-start-time" YYYY-MM-DD HH:MM:SS NL) ("geoip-client-origins" CC=N,CC=N,... NL) @@ -664,6 +670,12 @@ bridge and which are no known relays, rounded up to the nearest multiple of 8. + "bridge-ip-versions" FAM=N,FAM=N,... NL + [At most once.] + + List of unique IP addresses that have connected to the bridge + per protocol family. + "dirreq-stats-end" YYYY-MM-DD HH:MM:SS (NSEC s) NL [At most once.]

1 0

[torspec/master] Add "IPVersions" to CLIENTS_SEEN.
by nickm＠torproject.org 08 Nov '12

08 Nov '12

commit 43fb11f5808c2135d56574aa33ff738cfcab9ce4 Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Oct 19 23:23:04 2012 +0200 Add "IPVersions" to CLIENTS_SEEN. --- control-spec.txt | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 8e1cb9d..678f977 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1978,7 +1978,8 @@ 4.1.14. Per-country client stats The syntax is: - "650" SP "CLIENTS_SEEN" SP TimeStarted SP CountrySummary CRLF + "650" SP "CLIENTS_SEEN" SP TimeStarted SP CountrySummary SP + IPVersions CRLF We just generated a new summary of which countries we've seen clients from recently. The controller could display this for the user, e.g. @@ -1998,6 +1999,10 @@ 650-CLIENTS_SEEN TimeStarted="2008-12-25 23:50:43" CountrySummary=us=16,de=8,uk=8 + The IPVersions keyword has as its argument a comma-separated set of + "protocol-family=count" pairs. For example, + IPVersions=v4=16,v6=40 + 4.1.15. New consensus networkstatus has arrived The syntax is:

1 0

[torspec/master] Merge remote-tracking branch 'linus/bug5053-bug5055'
by nickm＠torproject.org 08 Nov '12

08 Nov '12

commit 9a518d98620e4d316cdac88811a5c33cc1787060 Merge: 93f2cb4 43fb11f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 8 12:23:35 2012 -0500 Merge remote-tracking branch 'linus/bug5053-bug5055' control-spec.txt | 7 ++++++- dir-spec.txt | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-)

1 0

[stem/master] Git image linked to gitweb rather than stem's repo
by atagar＠torproject.org 08 Nov '12

08 Nov '12

commit 07c5bae7fb4fd6139afcb2a14abdddad75580e0e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 8 08:29:01 2012 -0800 Git image linked to gitweb rather than stem's repo Oops, not sure how I got this wrong. We want to link to our repository, not the list of projects. --- docs/download.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/download.rst b/docs/download.rst index 384c048..f98672c 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -19,7 +19,7 @@ Download :header-rows: 0 * - .. image:: /_static/section/git.png - :target: https://gitweb.torproject.org/ + :target: https://gitweb.torproject.org/stem.git - .. image:: /_static/label/git.png

1 0

[ooni-probe/master] Move test inputs back to where they were.
by art＠torproject.org 08 Nov '12

08 Nov '12

commit 92cf32da1f3d84bf36a1b982c8cc281e5e8f3024 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 8 17:01:47 2012 +0100 Move test inputs back to where they were. --- inputs/dns_tamper_file.txt | 3 --- inputs/dns_tamper_test_resolvers.txt | 2 -- inputs/http_host_file.txt | 2 -- inputs/keyword_filtering_file.txt | 2 -- inputs/url_lists_file.txt | 2 -- test_inputs/README | 2 ++ test_inputs/dns_tamper_file.txt | 3 +++ test_inputs/dns_tamper_test_resolvers.txt | 2 ++ test_inputs/http_host_file.txt | 2 ++ test_inputs/keyword_filtering_file.txt | 2 ++ test_inputs/url_lists_file.txt | 2 ++ 11 files changed, 13 insertions(+), 11 deletions(-) diff --git a/inputs/dns_tamper_file.txt b/inputs/dns_tamper_file.txt deleted file mode 100644 index 25f365c..0000000 --- a/inputs/dns_tamper_file.txt +++ /dev/null @@ -1,3 +0,0 @@ -torproject.org -google.com -measurementlab.net diff --git a/inputs/dns_tamper_test_resolvers.txt b/inputs/dns_tamper_test_resolvers.txt deleted file mode 100644 index 14c77e0..0000000 --- a/inputs/dns_tamper_test_resolvers.txt +++ /dev/null @@ -1,2 +0,0 @@ -8.8.8.8 -8.8.4.4 diff --git a/inputs/http_host_file.txt b/inputs/http_host_file.txt deleted file mode 100644 index 12afb18..0000000 --- a/inputs/http_host_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -torproject.org -ooni.nu diff --git a/inputs/keyword_filtering_file.txt b/inputs/keyword_filtering_file.txt deleted file mode 100644 index 4583bae..0000000 --- a/inputs/keyword_filtering_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -antani -sblinda diff --git a/inputs/url_lists_file.txt b/inputs/url_lists_file.txt deleted file mode 100644 index 16a4f58..0000000 --- a/inputs/url_lists_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -http://ooni.nu/test -http://torproject.org/ diff --git a/test_inputs/README b/test_inputs/README new file mode 100644 index 0000000..cbf0782 --- /dev/null +++ b/test_inputs/README @@ -0,0 +1,2 @@ +These inputs are here to assist the running of before_i_commit.sh that is used to verify proper functioning of ooniprobe. + diff --git a/test_inputs/dns_tamper_file.txt b/test_inputs/dns_tamper_file.txt new file mode 100644 index 0000000..25f365c --- /dev/null +++ b/test_inputs/dns_tamper_file.txt @@ -0,0 +1,3 @@ +torproject.org +google.com +measurementlab.net diff --git a/test_inputs/dns_tamper_test_resolvers.txt b/test_inputs/dns_tamper_test_resolvers.txt new file mode 100644 index 0000000..14c77e0 --- /dev/null +++ b/test_inputs/dns_tamper_test_resolvers.txt @@ -0,0 +1,2 @@ +8.8.8.8 +8.8.4.4 diff --git a/test_inputs/http_host_file.txt b/test_inputs/http_host_file.txt new file mode 100644 index 0000000..12afb18 --- /dev/null +++ b/test_inputs/http_host_file.txt @@ -0,0 +1,2 @@ +torproject.org +ooni.nu diff --git a/test_inputs/keyword_filtering_file.txt b/test_inputs/keyword_filtering_file.txt new file mode 100644 index 0000000..4583bae --- /dev/null +++ b/test_inputs/keyword_filtering_file.txt @@ -0,0 +1,2 @@ +antani +sblinda diff --git a/test_inputs/url_lists_file.txt b/test_inputs/url_lists_file.txt new file mode 100644 index 0000000..16a4f58 --- /dev/null +++ b/test_inputs/url_lists_file.txt @@ -0,0 +1,2 @@ +http://ooni.nu/test +http://torproject.org/

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 08 Nov '12

08 Nov '12

commit 3f053d487e0c4a982df4c7ab842924ced8fa74d1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 8 15:45:19 2012 +0000 Update translations for vidalia_alpha --- lv/vidalia_lv.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 6d266ac..4fe0064 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-08 14:58+0000\n" +"PO-Revision-Date: 2012-11-08 15:25+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3098,7 +3098,7 @@ msgstr "443. ports" msgctxt "ServerPage" msgid "Secure Websites (SSL)" -msgstr "" +msgstr "Drošas tīmekļa vietnes (SSL)" msgctxt "ServerPage" msgid "Port 80" @@ -3110,31 +3110,31 @@ msgstr "Tīmekļa vietnes" msgctxt "ServerPage" msgid "Show help topic on exit policies" -msgstr "" +msgstr "Rādīt palīdzības tematus par iziešanas kārtību" msgctxt "ServerPage" msgid "" "What Internet resources should users be able to access from your relay?" -msgstr "" +msgstr "Kādiem interneta resursiem lietotājiem vajadzētu spēt piekļūt no Jūsu retranslatora?" msgctxt "ServerPage" msgid "" "Tor will still block some outgoing mail and file sharing applications by " "default to reduce spam and other abuse." -msgstr "" +msgstr "Tomēr, pēc noklusēšanas, arī Tor bloķēs daļu izejošu e-pastu un datņu koplietošanas lietoņu, lai ierobežotu surogātpastu un citus noteikumu pārkāpumus. " msgctxt "ServerPage" msgid "Exit Policies" -msgstr "" +msgstr "Iziešanas kārtība" msgctxt "ServerPage" msgid "Let others access your bridge by giving them this line:" -msgstr "" +msgstr "Ļaut citiem piekļūt Jūsu tiltam, dodot viņiem šo rindu: " msgctxt "ServerPage" msgid "" "This is the identity of your bridge relay that you can give to other people" -msgstr "" +msgstr "Šī ir Jūsu tilta retranslatora identitāte, kuru Jūs varat dot citiem lietotājiem" msgctxt "ServerPage" msgid "Copy your bridge relay's identity to the clipboard"

1 0

[ooni-probe/master] Refactor reporting system
by art＠torproject.org 08 Nov '12

08 Nov '12

commit cf72e20df6fb9271f415984c65c7026f26f56325 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 8 16:08:57 2012 +0100 Refactor reporting system * Fix import error in http host test --- nettests/core/http_host.py | 1 + nettests/simpletest.py | 2 +- ooni/nettest.py | 4 +++- ooni/reporter.py | 31 ++++++++++++------------------- ooni/runner.py | 11 ++++++++--- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/nettests/core/http_host.py b/nettests/core/http_host.py index 137d3b8..e09fc84 100644 --- a/nettests/core/http_host.py +++ b/nettests/core/http_host.py @@ -9,6 +9,7 @@ # :authors: Arturo Filastò # :licence: see LICENSE +from twisted.python import usage from ooni.templates import httpt class UsageOptions(usage.Options): diff --git a/nettests/simpletest.py b/nettests/simpletest.py index a83b8ce..11bd485 100644 --- a/nettests/simpletest.py +++ b/nettests/simpletest.py @@ -1,6 +1,6 @@ from ooni import nettest class SimpleTest(nettest.NetTestCase): - inputs = range(1,100) + inputs = range(1,20) optParameters = [['asset', 'a', None, 'Asset file'], ['controlserver', 'c', 'google.com', 'Specify the control server'], ['resume', 'r', 0, 'Resume at this index'], diff --git a/ooni/nettest.py b/ooni/nettest.py index a8d3560..83c5727 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -47,10 +47,12 @@ class InputTestSuite(pyunit.TestSuite): "running is not a nettest") log.debug(e) - log.debug("Running test") + log.debug("Running test with name %s" % str(test)) # XXX we may want in a future to put all of these tests inside of a # thread pool and run them all in parallel test(result) + # Here we need to set the test name to be that of the test case we are running + result._tests[self._idx]['test'] = str(test) log.debug("Ran.") self._idx += 1 diff --git a/ooni/reporter.py b/ooni/reporter.py index 6fab5f9..c9654e8 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -156,10 +156,10 @@ class OReporter(pyunit.TestResult): self._write(format_string, *args) self._write('\n') - def writeYamlLine(self, line): - to_write = safe_dump([line]) - self._write(to_write) - + def writeReportEntry(self, entry): + self._write('---\n') + self._write(safe_dump(entry)) + self._write('...\n') class ReporterFactory(OReporter): """ @@ -224,8 +224,7 @@ class ReporterFactory(OReporter): 'test_version': options['version'], } - self.writeYamlLine(test_details) - self._writeln('') + self.writeReportEntry(test_details) def create(self): r = OONIReporter(self._stream, self.tbformat, self.realtime, @@ -265,7 +264,7 @@ class OONIReporter(OReporter): if not self._startTime: self._startTime = self._getTime() - log.debug("Starting test %s" % idx) + log.debug("startTest on %s" % idx) test.report = {} self._tests[idx] = {} @@ -277,17 +276,15 @@ class OONIReporter(OReporter): test_input = test.input self._tests[idx]['input'] = test_input - self._tests[idx]['name'] = test.name log.debug("Now starting %s" % self._tests[idx]) - def stopTest(self, test): log.debug("Stopping test") super(OONIReporter, self).stopTest(test) idx = self.getTestIndex(test) - self._tests[idx]['last_time'] = self._getTime() - \ + self._tests[idx]['runtime'] = self._getTime() - \ self._tests[idx]['test_started'] # XXX I put a dict() here so that the object is re-instantiated and I @@ -313,15 +310,11 @@ class OONIReporter(OReporter): and L{_separator} are all implemented. """ log.debug("Test run concluded") - if self._startTime is not None: - self.report['start_time'] = self._startTime - self.report['run_time'] = time.time() - self._startTime - self.report['tests_run'] = self.testsRun - self.report['tests'] = self._tests - self.writeReport() - - def writeReport(self): - self.writeYamlLine(self.report) + self.writeTestsReport(self._tests) + + def writeTestsReport(self, tests): + for test in tests.values(): + self.writeReportEntry(test) def addSuccess(self, test): OReporter.addSuccess(self, test) diff --git a/ooni/runner.py b/ooni/runner.py index b4d9560..6ed89ab 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -170,12 +170,17 @@ class ORunner(object): log.msg("Could not find inputs!") log.msg("options[0] = %s" % first) self.inputs = [None] + if cmd_line_options['reportfile']: + report_filename = cmd_line_options['reportfile'] + else: + report_filename = 'report_'+date.timestamp()+'.yamloo' + if os.path.exists(report_filename): + os.rename(report_filename, report_filename+'.1') try: - reportFile = open(cmd_line_options['reportfile'], 'a+') + reportFile = open(report_filename, 'w+') except TypeError: - filename = 'report_'+date.timestamp()+'.yaml' - reportFile = open(filename, 'a+') + reportFile = open(filename_filename, 'w+') self.reporterFactory = ReporterFactory(reportFile, testSuite=self.baseSuite(self.cases))

1 0

[ooni-probe/master] Disabled debug log in default config file
by art＠torproject.org 08 Nov '12

08 Nov '12

commit 5d0ee1bf474055f65f0913594f5c0ddb6017988e Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 8 16:22:09 2012 +0100 Disabled debug log in default config file * Make runner rename file to .old if it already exists --- ooni/runner.py | 11 ++++++----- ooniprobe.conf | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index 6ed89ab..1e1d6a5 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -170,17 +170,18 @@ class ORunner(object): log.msg("Could not find inputs!") log.msg("options[0] = %s" % first) self.inputs = [None] + if cmd_line_options['reportfile']: report_filename = cmd_line_options['reportfile'] else: report_filename = 'report_'+date.timestamp()+'.yamloo' if os.path.exists(report_filename): - os.rename(report_filename, report_filename+'.1') - try: - reportFile = open(report_filename, 'w+') - except TypeError: - reportFile = open(filename_filename, 'w+') + print "Report already exists with filename %s" % report_filename + print "Renaming it to %s" % report_filename+'.old' + os.rename(report_filename, report_filename+'.old') + + reportFile = open(report_filename, 'w+') self.reporterFactory = ReporterFactory(reportFile, testSuite=self.baseSuite(self.cases)) diff --git a/ooniprobe.conf b/ooniprobe.conf index 2039951..2781476 100644 --- a/ooniprobe.conf +++ b/ooniprobe.conf @@ -21,5 +21,5 @@ advanced: # database file. This should be the directory in which OONI is installed # /path/to/ooni-probe/data/ geoip_data_dir: /home/x/code/networking/ooni-probe/data/ - debug: true + debug: false

1 0

[ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by art＠torproject.org 08 Nov '12

08 Nov '12

commit 50c48cc6e50149538c2f647d5dda6c9bb0caaeb7 Merge: 5d0ee1b 16d2709 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 8 16:24:33 2012 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe * 'master' of ssh://git-rw.torproject.org/ooni-probe: * Moved metaclass code to separate branch 'meta'. * Removed unused code from assertions.py. * Deleted config.py and process.py. * Removed bug as a result of merging which reintroduced the bug for log messages being printed twice. * Made the submit-patch script create the /patches directory if it doesn't already exist. * Moved /test_inputs/* to /inputs. * Adding new Makefile in top dir * Adding saved copy of *.secdev.org SSL cert so we can correctly check for cert warning. * Updated installation documentation. * Added brief doctrings to get pylint to shutup about it. * Changed the nettest inputParser to no longer be wrapped by @staticmethod, because that might be confusing to test writers. * Changed runner.getTestOptions() to return the localoptions, in addition to setting them as an attribute. * There are still bugs in the options parser, and inputs is a listiterater, which also needs to be fixed. * Fixed oonicli.py trying to catch the wrong exception. * Added a docstring in oonicli.py. * Fixed oonicli.py not printing the help/info message when called without arguments. Conflicts: nettests/simpletest.py Makefile | 198 +++++++++++++++++++++++ bin/ooniprobe | 23 ++-- docs/source/install.rst | 12 ++- inputs/README | 46 ++++++ inputs/dns_tamper_file.txt | 3 + inputs/dns_tamper_test_resolvers.txt | 2 + inputs/http_host_file.txt | 2 + inputs/keyword_filtering_file.txt | 2 + inputs/url_lists_file.txt | 2 + nettests/bridge_reachability/echo.py | 8 +- nettests/simpletest.py | 23 ++- ooni/lib/secdev.org.pem | 20 +++ ooni/nettest.py | 13 ++- ooni/oonicli.py | 22 ++-- ooni/runner.py | 3 + submit-patch | 7 +- test_inputs/README | 48 ------ test_inputs/dns_tamper_file.txt | 3 - test_inputs/dns_tamper_test_resolvers.txt | 2 - test_inputs/http_host_file.txt | 2 - test_inputs/keyword_filtering_file.txt | 2 - test_inputs/url_lists_file.txt | 2 - wtf/README | 9 - wtf/assertions.py | 180 --------------------- wtf/config.py | 66 -------- wtf/meta.py | 241 ----------------------------- wtf/process.py | 73 --------- wtf/timer.py | 107 ------------- 28 files changed, 347 insertions(+), 774 deletions(-) diff --cc nettests/simpletest.py index 11bd485,2769a15..b9efc73 --- a/nettests/simpletest.py +++ b/nettests/simpletest.py @@@ -1,11 -1,21 +1,21 @@@ + #-*- coding: utf-8 -*- + """Contains classes for testing the basic functionality of oonicli.""" + from ooni import nettest + class SimpleTest(nettest.NetTestCase): - inputs = range(1,20) + """ + A very simple test which prints integers, for testing that oonicli is + working correctly. + """ - inputs = range(1, 100) ++ inputs = range(0, 20) optParameters = [['asset', 'a', None, 'Asset file'], - ['controlserver', 'c', 'google.com', 'Specify the control server'], + ['controlserver', 'c', 'google.com', + 'Specify the control server'], ['resume', 'r', 0, 'Resume at this index'], ['other', 'o', None, 'Other arguments']] - def test_foo(self, *arg, **kw): + def test_foo(self): + """Test that tests are working.""" print "Running %s with %s" % ("test_foo", self.input) self.report['test_foo'] = 'Antani' self.report['shared'] = "sblinda"

1 0