March 2013 - tor-commits - lists.torproject.org

[ooni-probe/master] Make sure the collector address is at least the minimum length required
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit beb5b25c62fb36c600f25178e1121661efd962c0 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Feb 22 18:58:00 2013 +0100 Make sure the collector address is at least the minimum length required --- ooni/reporter.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index f89d5bd..69d4892 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -254,7 +254,8 @@ class OONIBReporter(OReporter): if the oonib reporter is not valid. """ regexp = '^(http|httpo):\/\/[a-zA-Z0-9\-\.]+(:\d+)?$' - if not re.match(regexp, self.collectorAddress): + if not re.match(regexp, self.collectorAddress) or \ + len(self.collectorAddress) < 30: raise InvalidOONIBCollectorAddress @defer.inlineCallbacks

1 0

[ooni-probe/master] Wait until Tor has started before adding reporters
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit f965f0aa8c8e8a7b6eeb5373a4703c2857e1c5e1 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Feb 22 16:43:54 2013 +0100 Wait until Tor has started before adding reporters As we get the client IP from Tor, we need to wait until Tor has bootstrapped (if start_tor is set) before setting up the reporters. Note that we should try and get the client IP by an alternate mechanism if start_tor is not enabled in ooniprobe.conf or if we are unable to get the client IP from Tor. --- ooni/oonicli.py | 49 ++++++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 23 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 77d4549..dd03a08 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -115,11 +115,7 @@ def runWithDirector(): log.debug("No test deck detected") test_list.append(NetTestLoader(global_options['test'], net_test_args)) - - - director = Director() - d = director.start() - + # check each test's usageOptions for net_test_loader in test_list: try: net_test_loader.checkOptions() @@ -132,22 +128,29 @@ def runWithDirector(): print net_test_loader.usageOptions().getUsage() sys.exit(2) - yaml_reporter = YAMLReporter(net_test_loader.testDetails) - reporters = [yaml_reporter] - - if global_options['collector']: - try: - oonib_reporter = OONIBReporter(net_test_loader.testDetails, - global_options['collector']) - reporters.append(oonib_reporter) - except InvalidOONIBCollectorAddress: - log.err("Invalid format for oonib collector address.") - log.msg("Should be in the format http://<collector_address>:<port>") - log.msg("for example: ooniprobe -c httpo://nkvphnp3p6agi5qq.onion") - sys.exit(1) - - #XXX add all the tests to be run sequentially - d.addCallback(director.startNetTest, net_test_loader, reporters) - d.addCallback(shutdown) - #XXX: if errback is called they do not propagate + director = Director() + d = director.start() + + # Wait until director has started up (including bootstrapping Tor) before adding tess + def post_director_start(_): + for net_test_loader in test_list: + yaml_reporter = YAMLReporter(net_test_loader.testDetails) + reporters = [yaml_reporter] + + if global_options['collector']: + try: + oonib_reporter = OONIBReporter(net_test_loader.testDetails, + global_options['collector']) + reporters.append(oonib_reporter) + except InvalidOONIBCollectorAddress: + log.err("Invalid format for oonib collector address.") + log.msg("Should be in the format http://<collector_address>:<port>") + log.msg("for example: ooniprobe -c httpo://nkvphnp3p6agi5qq.onion") + sys.exit(1) + + #XXX add all the tests to be run sequentially + log.debug("adding callback for startNetTest") + d.addCallback(director.startNetTest, net_test_loader, reporters) + d.addCallback(shutdown) + d.addCallback(post_director_start) reactor.run()

1 0

[ooni-probe/master] Add missing imports
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit dccb79c6351291a8b568c52c08b49b853c5579cf Author: aagbsn <aagbsn(a)extc.org> Date: Fri Feb 22 16:25:14 2013 +0100 Add missing imports --- ooni/nettest.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 9e86ab4..a29b2f0 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -1,11 +1,12 @@ import os +import re from twisted.internet import defer, reactor from twisted.trial.runner import filenameToModule from twisted.python import usage, reflect from ooni.tasks import Measurement -from ooni.utils import log, checkForRoot, NotRootError +from ooni.utils import log, checkForRoot, NotRootError, geodata from ooni import config from ooni import otime

1 0

[ooni-probe/master] Fix a bug where test options were not included in the report
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 2f5a4c1bb17f881ebfca63e003f116a22eaf0a03 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Feb 26 22:24:49 2013 +0100 Fix a bug where test options were not included in the report --- ooni/nettest.py | 11 ++++++----- ooni/oonicli.py | 8 ++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index a29b2f0..6273d34 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -21,9 +21,9 @@ class NoTestCasesFound(Exception): class NetTestLoader(object): method_prefix = 'test' - def __init__(self, net_test_file, net_test_args): - self.netTestArgs = net_test_args - self.testCases = self.loadNetTest(net_test_file) + def __init__(self, options): + self.options = options + self.testCases = self.loadNetTest(options['test']) @property def testDetails(self): @@ -69,7 +69,8 @@ class NetTestLoader(object): 'test_name': self.testName, 'test_version': self.testVersion, 'software_name': 'ooniprobe', - 'software_version': software_version + 'software_version': software_version, + 'options': self.options } return test_details @@ -159,7 +160,7 @@ class NetTestLoader(object): for klass in test_classes: options = self.usageOptions() - options.parseOptions(self.netTestArgs) + options.parseOptions(self.options['subargs']) if options: klass.localOptions = options diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 1ca70c4..2fd4688 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -100,7 +100,6 @@ def runWithDirector(): """ global_options = parseOptions() log.start(global_options['logfile']) - net_test_args = global_options.get('subargs') # contains (test_cases, options, cmd_line_options) test_list = [] @@ -108,13 +107,10 @@ def runWithDirector(): if global_options['testdeck']: test_deck = yaml.safe_load(open(global_options['testdeck'])) for test in test_deck: - test_options = test['options'] - test_file = test_options['test'] - test_subargs = test_options['subargs'] - test_list.append(NetTestLoader(test_file, test_subargs)) + test_list.append(NetTestLoader(test['options'])) else: log.debug("No test deck detected") - test_list.append(NetTestLoader(global_options['test'], net_test_args)) + test_list.append(NetTestLoader(global_options)) # check each test's usageOptions for net_test_loader in test_list:

1 0

[ooni-probe/master] add a set of tests that do not require root
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 2f8e8a04301dce35f86824114b1facda9565d546 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Feb 26 22:24:13 2013 +0100 add a set of tests that do not require root --- decks/short_no_root.deck | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/decks/short_no_root.deck b/decks/short_no_root.deck new file mode 100644 index 0000000..afb7b75 --- /dev/null +++ b/decks/short_no_root.deck @@ -0,0 +1,60 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test: nettests/manipulation/captiveportal.py + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/url_lists_file.txt] + test: nettests/blocking/http_requests.py + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/tcpconnect_host_file.txt] + test: nettests/blocking/tcpconnect.py + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/http_host_file.txt, -T, example_inputs/dns_tamper_test_resolvers.txt] + test: nettests/blocking/dnsconsistency.py + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-b, 'http://93.95.227.200'] + test: nettests/manipulation/http_header_field_manipulation.py + testdeck: null

1 0

[ooni-probe/master] add list of hosts for testing tcpconnect
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit dba1b826c49e0ebc0db816d565641c4301767c20 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Feb 27 02:02:17 2013 +0100 add list of hosts for testing tcpconnect --- example_inputs/tcpconnect_host_file.txt | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/example_inputs/tcpconnect_host_file.txt b/example_inputs/tcpconnect_host_file.txt new file mode 100644 index 0000000..a1e876b --- /dev/null +++ b/example_inputs/tcpconnect_host_file.txt @@ -0,0 +1,3 @@ +86.59.30.40:80 +207.97.227.239:22 +173.194.35.160:443

1 0

[ooni-probe/master] Add a default OONIB reporter unless instructed otherwise
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit d8bb80f96cb012a80f0234ea0fc3cfd2937e6844 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Feb 21 11:35:04 2013 +0100 Add a default OONIB reporter unless instructed otherwise --- ooni/oonicli.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index dd03a08..1ca70c4 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -4,6 +4,7 @@ import sys import os import time import yaml +import random from twisted.internet import reactor from twisted.python import usage @@ -148,9 +149,17 @@ def runWithDirector(): log.msg("for example: ooniprobe -c httpo://nkvphnp3p6agi5qq.onion") sys.exit(1) - #XXX add all the tests to be run sequentially + # Select one of the baked-in reporters unless the user has requested otherwise + if not global_options['no-default-reporter']: + with open('collector') as f: + reporter_url = random.choice(f.readlines()) + reporter_url = reporter_url.split('#')[0].strip() + oonib_reporter = OONIBReporter(net_test_loader.testDetails, reporter_url) + reporters.append(oonib_reporter) + log.debug("adding callback for startNetTest") d.addCallback(director.startNetTest, net_test_loader, reporters) d.addCallback(shutdown) + d.addCallback(post_director_start) reactor.run()

1 0

[ooni-probe/master] add alexa-top-1k to example_inputs for testing larger input sets
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit a9dbc3a958c063125c9dfa6049a7ea9e04d86e9f Author: aagbsn <aagbsn(a)extc.org> Date: Tue Feb 26 22:30:20 2013 +0100 add alexa-top-1k to example_inputs for testing larger input sets --- example_inputs/alexa-top-1k.txt | 1000 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 1000 insertions(+), 0 deletions(-) diff --git a/example_inputs/alexa-top-1k.txt b/example_inputs/alexa-top-1k.txt new file mode 100644 index 0000000..d101505 --- /dev/null +++ b/example_inputs/alexa-top-1k.txt @@ -0,0 +1,1000 @@ +http://google.com/ +http://facebook.com/ +http://youtube.com/ +http://yahoo.com/ +http://baidu.com/ +http://wikipedia.org/ +http://live.com/ +http://twitter.com/ +http://qq.com/ +http://amazon.com/ +http://blogspot.com/ +http://linkedin.com/ +http://taobao.com/ +http://google.co.in/ +http://yahoo.co.jp/ +http://sina.com.cn/ +http://msn.com/ +http://google.com.hk/ +http://google.de/ +http://bing.com/ +http://yandex.ru/ +http://wordpress.com/ +http://ebay.com/ +http://babylon.com/ +http://google.co.jp/ +http://google.co.uk/ +http://google.fr/ +http://vk.com/ +http://apple.com/ +http://163.com/ +http://googleusercontent.com/ +http://soso.com/ +http://microsoft.com/ +http://mail.ru/ +http://weibo.com/ +http://google.com.br/ +http://tumblr.com/ +http://pinterest.com/ +http://google.es/ +http://paypal.com/ +http://craigslist.org/ +http://ask.com/ +http://google.it/ +http://google.ru/ +http://xhamster.com/ +http://blogger.com/ +http://sohu.com/ +http://go.com/ +http://bbc.co.uk/ +http://xvideos.com/ +http://avg.com/ +http://imdb.com/ +http://fc2.com/ +http://google.com.mx/ +http://youku.com/ +http://ifeng.com/ +http://flickr.com/ +http://google.ca/ +http://tudou.com/ +http://t.co/ +http://hao123.com/ +http://tmall.com/ +http://conduit.com/ +http://adobe.com/ +http://odnoklassniki.ru/ +http://aol.com/ +http://espn.go.com/ +http://pornhub.com/ +http://ebay.de/ +http://cnn.com/ +http://blogspot.in/ +http://google.co.id/ +http://mywebsearch.com/ +http://livejasmin.com/ +http://amazon.de/ +http://zedo.com/ +http://huffingtonpost.com/ +http://redtube.com/ +http://thepiratebay.se/ +http://google.com.tr/ +http://rakuten.co.jp/ +http://stackoverflow.com/ +http://sogou.com/ +http://google.com.au/ +http://alibaba.com/ +http://about.com/ +http://godaddy.com/ +http://ebay.co.uk/ +http://adf.ly/ +http://amazon.co.jp/ +http://wordpress.org/ +http://google.pl/ +http://uol.com.br/ +http://mediafire.com/ +http://imgur.com/ +http://dailymotion.com/ +http://instagram.com/ +http://amazon.co.uk/ +http://cnet.com/ +http://netflix.com/ +http://youporn.com/ +http://ameblo.jp/ +http://360buy.com/ +http://alipay.com/ +http://chinaz.com/ +http://globo.com/ +http://livedoor.com/ +http://bp.blogspot.com/ +http://360.cn/ +http://nytimes.com/ +http://4shared.com/ +http://doubleclick.com/ +http://xnxx.com/ +http://adcash.com/ +http://torrentz.eu/ +http://google.nl/ +http://incredibar.com/ +http://neobux.com/ +http://google.com.sa/ +http://searchnu.com/ +http://vimeo.com/ +http://ehow.com/ +http://livejournal.com/ +http://dropbox.com/ +http://google.com.ar/ +http://bankofamerica.com/ +http://dailymail.co.uk/ +http://douban.com/ +http://search-results.com/ +http://warriorforum.com/ +http://renren.com/ +http://reddit.com/ +http://weather.com/ +http://tube8.com/ +http://badoo.com/ +http://pconline.com.cn/ +http://chase.com/ +http://secureserver.net/ +http://wigetmedia.com/ +http://tianya.cn/ +http://deviantart.com/ +http://indiatimes.com/ +http://aweber.com/ +http://cnzz.com/ +http://google.com.pk/ +http://stumbleupon.com/ +http://kat.ph/ +http://google.cn/ +http://spiegel.de/ +http://google.com.eg/ +http://blogspot.com.br/ +http://blogfa.com/ +http://56.com/ +http://letv.com/ +http://mozilla.org/ +http://amazonaws.com/ +http://google.co.th/ +http://google.co.za/ +http://espncricinfo.com/ +http://answers.com/ +http://goo.ne.jp/ +http://sourceforge.net/ +http://foxnews.com/ +http://clicksor.com/ +http://softonic.com/ +http://addthis.com/ +http://walmart.com/ +http://etsy.com/ +http://wellsfargo.com/ +http://comcast.net/ +http://reference.com/ +http://wikimedia.org/ +http://slideshare.net/ +http://liveinternet.ru/ +http://salesforce.com/ +http://booking.com/ +http://squidoo.com/ +http://photobucket.com/ +http://google.co.ve/ +http://allegro.pl/ +http://fiverr.com/ +http://onet.pl/ +http://depositfiles.com/ +http://skype.com/ +http://wikia.com/ +http://themeforest.net/ +http://statcounter.com/ +http://myspace.com/ +http://hootsuite.com/ +http://funmoods.com/ +http://xinhuanet.com/ +http://fbcdn.net/ +http://google.com.my/ +http://bild.de/ +http://guardian.co.uk/ +http://ucoz.ru/ +http://outbrain.com/ +http://people.com.cn/ +http://nbcnews.com/ +http://scribd.com/ +http://google.com.co/ +http://pengyou.com/ +http://mgid.com/ +http://soundcloud.com/ +http://google.com.vn/ +http://free.fr/ +http://google.gr/ +http://optmd.com/ +http://nicovideo.jp/ +http://rediff.com/ +http://leboncoin.fr/ +http://it168.com/ +http://zol.com.cn/ +http://google.be/ +http://download.com/ +http://w3schools.com/ +http://china.com/ +http://adultfriendfinder.com/ +http://domaintools.com/ +http://xunlei.com/ +http://naver.com/ +http://archive.org/ +http://sweetim.com/ +http://rapidshare.com/ +http://youjizz.com/ +http://58.com/ +http://files.wordpress.com/ +http://nfl.com/ +http://wsj.com/ +http://yelp.com/ +http://profitclicking.com/ +http://iqiyi.com/ +http://blogspot.com.es/ +http://hostgator.com/ +http://orange.fr/ +http://google.com.tw/ +http://isohunt.com/ +http://hudong.com/ +http://google.com.ua/ +http://google.se/ +http://soku.com/ +http://tagged.com/ +http://google.at/ +http://jqw.com/ +http://reuters.com/ +http://telegraph.co.uk/ +http://indeed.com/ +http://4399.com/ +http://uploaded.net/ +http://filestube.com/ +http://ups.com/ +http://flipkart.com/ +http://wp.pl/ +http://kaixin001.com/ +http://tripadvisor.com/ +http://taringa.net/ +http://samsung.com/ +http://rutracker.org/ +http://google.ro/ +http://rambler.ru/ +http://libero.it/ +http://cam4.com/ +http://paipai.com/ +http://yieldmanager.com/ +http://web.de/ +http://google.com.ph/ +http://gmx.net/ +http://imageshack.us/ +http://xing.com/ +http://2345.com/ +http://dianxin.cn/ +http://php.net/ +http://hp.com/ +http://mashable.com/ +http://yesky.com/ +http://att.com/ +http://csdn.net/ +http://ikea.com/ +http://washingtonpost.com/ +http://ameba.jp/ +http://pandora.com/ +http://github.com/ +http://google.com.pe/ +http://forbes.com/ +http://hatena.ne.jp/ +http://wordreference.com/ +http://pof.com/ +http://google.com.ng/ +http://aliexpress.com/ +http://google.ch/ +http://hardsextube.com/ +http://thefreedictionary.com/ +http://clickbank.com/ +http://iminent.com/ +http://narod.ru/ +http://etao.com/ +http://bet365.com/ +http://google.cl/ +http://ilivid.com/ +http://google.com.sg/ +http://weebly.com/ +http://amazon.cn/ +http://ero-advertising.com/ +http://rapidgator.net/ +http://youdao.com/ +http://mercadolivre.com.br/ +http://yourlust.com/ +http://constantcontact.com/ +http://xcar.com.cn/ +http://groupon.com/ +http://target.com/ +http://hurriyet.com.tr/ +http://media.tumblr.com/ +http://businessinsider.com/ +http://5000pk.com/ +http://9gag.com/ +http://kakaku.com/ +http://akamaihd.net/ +http://putlocker.com/ +http://shutterstock.com/ +http://kaskus.co.id/ +http://ebay.it/ +http://bitauto.com/ +http://goal.com/ +http://usps.com/ +http://milliyet.com.tr/ +http://techcrunch.com/ +http://amazon.fr/ +http://ku6.com/ +http://typepad.com/ +http://dell.com/ +http://terra.com.br/ +http://huanqiu.com/ +http://digitalpoint.com/ +http://tlbb8.com/ +http://ebay.com.au/ +http://engadget.com/ +http://twimg.com/ +http://blogspot.de/ +http://soufun.com/ +http://t-online.de/ +http://hulu.com/ +http://popads.net/ +http://xe.com/ +http://cj.com/ +http://in.com/ +http://nih.gov/ +http://joomla.org/ +http://battle.net/ +http://americanexpress.com/ +http://kooora.com/ +http://drtuber.com/ +http://marca.com/ +http://gsmarena.com/ +http://movie2k.to/ +http://mlb.com/ +http://elpais.com/ +http://gazeta.pl/ +http://blogspot.jp/ +http://bestbuy.com/ +http://agoda.com/ +http://uimserv.net/ +http://ig.com.br/ +http://mailchimp.com/ +http://seznam.cz/ +http://siteadvisor.com/ +http://linkbucks.com/ +http://zimbio.com/ +http://match.com/ +http://extratorrent.com/ +http://tlbb2.com/ +http://google.pt/ +http://verizonwireless.com/ +http://fedex.com/ +http://angege.com/ +http://infusionsoft.com/ +http://peyvandha.ir/ +http://ezinearticles.com/ +http://zanox.com/ +http://elmundo.es/ +http://google.co.hu/ +http://bluehost.com/ +http://detik.com/ +http://adserverplus.com/ +http://4dsply.com/ +http://aili.com/ +http://istockphoto.com/ +http://leo.org/ +http://autohome.com.cn/ +http://hubpages.com/ +http://google.ie/ +http://gutefrage.net/ +http://usatoday.com/ +http://mycalendarbook.com/ +http://ebay.fr/ +http://51.com/ +http://freelancer.com/ +http://speedtest.net/ +http://google.cz/ +http://aizhan.com/ +http://drudgereport.com/ +http://webs.com/ +http://w3.org/ +http://seomoz.org/ +http://vnexpress.net/ +http://homeway.com.cn/ +http://google.dk/ +http://ganji.com/ +http://alimama.com/ +http://google.ae/ +http://twoo.com/ +http://mpnrs.com/ +http://naver.jp/ +http://mixi.jp/ +http://nifty.com/ +http://12306.cn/ +http://analyrics.com/ +http://adnxs.com/ +http://pcauto.com.cn/ +http://tlbbsifu.com/ +http://cntv.cn/ +http://yandex.ua/ +http://seesaa.net/ +http://2ch.net/ +http://cbssports.com/ +http://ask.fm/ +http://y8.com/ +http://bloomberg.com/ +http://360tl.com/ +http://pch.com/ +http://ebay.in/ +http://chip.de/ +http://abcnews.go.com/ +http://bannersbroker.com/ +http://dangdang.com/ +http://over-blog.com/ +http://naukri.com/ +http://varzesh3.com/ +http://turbobit.net/ +http://letitbit.net/ +http://jobrapido.com/ +http://ign.com/ +http://pchome.net/ +http://126.com/ +http://maktoob.com/ +http://lemonde.fr/ +http://hdfcbank.com/ +http://chinanews.com/ +http://dianping.com/ +http://meetup.com/ +http://abril.com.br/ +http://google.no/ +http://capitalone.com/ +http://tmz.com/ +http://wix.com/ +http://google.dz/ +http://goodreads.com/ +http://51.la/ +http://histats.com/ +http://surveymonkey.com/ +http://51job.com/ +http://repubblica.it/ +http://fotolia.com/ +http://vancl.com/ +http://imesh.com/ +http://ning.com/ +http://informer.com/ +http://java.com/ +http://buzzfeed.com/ +http://jimdo.com/ +http://beeg.com/ +http://gmw.cn/ +http://ndtv.com/ +http://1channel.ch/ +http://bravotube.net/ +http://expedia.com/ +http://pcgames.com.cn/ +http://admin5.com/ +http://monster.com/ +http://daum.net/ +http://mop.com/ +http://multiply.com/ +http://qunar.com/ +http://google.co.il/ +http://dmm.co.jp/ +http://latimes.com/ +http://avito.ru/ +http://rr.com/ +http://commentcamarche.net/ +http://sape.ru/ +http://clixsense.com/ +http://enet.com.cn/ +http://viadeo.com/ +http://mihanblog.com/ +http://bitly.com/ +http://lefigaro.fr/ +http://rbc.ru/ +http://adsupply.com/ +http://microsoftonline.com/ +http://drupal.org/ +http://mynet.com/ +http://twitpic.com/ +http://google.co.kr/ +http://adultadworld.com/ +http://newegg.com/ +http://google.fi/ +http://kijiji.ca/ +http://wikihow.com/ +http://10086.cn/ +http://zillow.com/ +http://livescore.com/ +http://blogspot.it/ +http://webmd.com/ +http://xda-developers.com/ +http://nokia.com/ +http://wretch.cc/ +http://odesk.com/ +http://kuxun.cn/ +http://bleacherreport.com/ +http://myfreecams.com/ +http://outlook.com/ +http://livedoor.biz/ +http://linkwithin.com/ +http://tradedoubler.com/ +http://empowernetwork.com/ +http://delicious.com/ +http://ovh.net/ +http://nikkei.com/ +http://gotomeeting.com/ +http://39.net/ +http://largeporntube.com/ +http://tinyurl.com/ +http://ya.ru/ +http://spankwire.com/ +http://website-unavailable.com/ +http://sahibinden.com/ +http://nuvid.com/ +http://zing.vn/ +http://123rf.com/ +http://blackhatworld.com/ +http://icicibank.com/ +http://irctc.co.in/ +http://warriorplus.com/ +http://mobile.de/ +http://189.cn/ +http://ibm.com/ +http://yomiuri.co.jp/ +http://tabelog.com/ +http://softpedia.com/ +http://retailmenot.com/ +http://virgilio.it/ +http://livestrong.com/ +http://mercadolibre.com.ar/ +http://webmoney.ru/ +http://elance.com/ +http://oracle.com/ +http://swagbucks.com/ +http://searchqu.com/ +http://jiayuan.com/ +http://itau.com.br/ +http://mapquest.com/ +http://sakura.ne.jp/ +http://youm7.com/ +http://digg.com/ +http://biglobe.ne.jp/ +http://news.com.au/ +http://taleo.net/ +http://backpage.com/ +http://keezmovies.com/ +http://lzjl.com/ +http://stackexchange.com/ +http://gi-akademie.com/ +http://thesun.co.uk/ +http://pornhublive.com/ +http://immobilienscout24.de/ +http://jquery.com/ +http://homedepot.com/ +http://alphaporno.com/ +http://pclady.com.cn/ +http://duowan.com/ +http://hi5.com/ +http://allrecipes.com/ +http://corriere.it/ +http://foxsports.com/ +http://china.com.cn/ +http://folha.uol.com.br/ +http://ultimatepowerprofits.com/ +http://altervista.org/ +http://cnblogs.com/ +http://olx.in/ +http://verizon.com/ +http://macys.com/ +http://heise.de/ +http://xyxy.net/ +http://mercadolibre.com.mx/ +http://habrahabr.ru/ +http://persianblog.ir/ +http://quora.com/ +http://exoclick.com/ +http://issuu.com/ +http://google.sk/ +http://tribalfusion.com/ +http://gc.ca/ +http://eastmoney.com/ +http://examiner.com/ +http://zynga.com/ +http://lenta.ru/ +http://21cn.com/ +http://livingsocial.com/ +http://codecanyon.net/ +http://accuweather.com/ +http://xtube.com/ +http://7k7k.com/ +http://force.com/ +http://sergey-mavrodi.com/ +http://people.com/ +http://google.co.ma/ +http://feedburner.com/ +http://114so.cn/ +http://moneycontrol.com/ +http://quikr.com/ +http://cbsnews.com/ +http://sapo.pt/ +http://adscale.de/ +http://excite.co.jp/ +http://yxlady.com/ +http://tabnak.ir/ +http://gi-backoffice.com/ +http://templatemonster.com/ +http://ancestry.com/ +http://careerbuilder.com/ +http://yellowpages.com/ +http://timeanddate.com/ +http://orkut.com/ +http://list-manage.com/ +http://oneindia.in/ +http://suning.com/ +http://pogo.com/ +http://nhk.or.jp/ +http://wiktionary.org/ +http://haberturk.com/ +http://msn.com.cn/ +http://kickstarter.com/ +http://inbox.com/ +http://mybrowserbar.com/ +http://porn.com/ +http://hidemyass.com/ +http://nikkeibp.co.jp/ +http://kohls.com/ +http://blog.163.com/ +http://dh818.com/ +http://kinopoisk.ru/ +http://zippyshare.com/ +http://netlog.com/ +http://pixnet.net/ +http://gap.com/ +http://custhelp.com/ +http://4tube.com/ +http://cheezburger.com/ +http://nu.nl/ +http://v9.com/ +http://interia.pl/ +http://so-net.ne.jp/ +http://blog.com/ +http://getresponse.com/ +http://alnaddy.com/ +http://impress.co.jp/ +http://justdial.com/ +http://gizmodo.com/ +http://time.com/ +http://hotfile.com/ +http://who.is/ +http://wunderground.com/ +http://kankan.com/ +http://miniclip.com/ +http://welt.de/ +http://zhaopin.com/ +http://filehippo.com/ +http://qidian.com/ +http://shopathome.com/ +http://lifehacker.com/ +http://klicktrek.com/ +http://wired.com/ +http://888.com/ +http://mp3skull.com/ +http://okcupid.com/ +http://namecheap.com/ +http://porntube.com/ +http://twcczhu.com/ +http://doorblog.jp/ +http://makeuseof.com/ +http://infolinks.com/ +http://ccb.com/ +http://blekko.com/ +http://google.az/ +http://userapi.com/ +http://cbslocal.com/ +http://hubspot.com/ +http://zendesk.com/ +http://lequipe.fr/ +http://tutsplus.com/ +http://exblog.jp/ +http://video-one.com/ +http://118114.cn/ +http://macrumors.com/ +http://ggmm777.com/ +http://bitshare.com/ +http://hupu.com/ +http://trulia.com/ +http://hotels.com/ +http://sulekha.com/ +http://1uuc.com/ +http://google.co.nz/ +http://acesse.com/ +http://citibank.com/ +http://imagevenue.com/ +http://roulettebotplus.com/ +http://coupons.com/ +http://politico.com/ +http://anonym.to/ +http://gawker.com/ +http://searchengines.ru/ +http://cnbc.com/ +http://as.com/ +http://icbc.com.cn/ +http://1und1.de/ +http://sears.com/ +http://adfoc.us/ +http://sj-tl.com/ +http://blogimg.jp/ +http://bodybuilding.com/ +http://tinypic.com/ +http://imagebam.com/ +http://manta.com/ +http://marketwatch.com/ +http://zwaar.net/ +http://kompas.com/ +http://mangareader.net/ +http://eventbrite.com/ +http://businessweek.com/ +http://pagesjaunes.fr/ +http://amung.us/ +http://sitesell.com/ +http://babycenter.com/ +http://ctrip.com/ +http://orkut.com.br/ +http://linksynergy.com/ +http://dict.cc/ +http://shareasale.com/ +http://wcarev.com/ +http://okwave.jp/ +http://ustream.tv/ +http://watchseries.eu/ +http://intuit.com/ +http://snapdeal.com/ +http://td.com/ +http://nasa.gov/ +http://slickdeals.net/ +http://dpreview.com/ +http://tom.com/ +http://usbank.com/ +http://nydailynews.com/ +http://sanjesh.org/ +http://51buy.com/ +http://xhamstercams.com/ +http://968tl.com/ +http://myegy.com/ +http://cocolog-nifty.com/ +http://whitepages.com/ +http://disney.go.com/ +http://howstuffworks.com/ +http://barnesandnoble.com/ +http://klikbca.com/ +http://metacafe.com/ +http://lenovo.com/ +http://yandex.kz/ +http://pornerbros.com/ +http://aftonbladet.se/ +http://52tlbb.com/ +http://smashingmagazine.com/ +http://europa.eu/ +http://google.lk/ +http://18andabused.com/ +http://fatakat.com/ +http://tnaflix.com/ +http://woot.com/ +http://dantri.com.vn/ +http://itmedia.co.jp/ +http://focus.de/ +http://rednet.cn/ +http://asahi.com/ +http://sfr.fr/ +http://ca.gov/ +http://ocn.ne.jp/ +http://idnes.cz/ +http://pixiv.net/ +http://24h.com.vn/ +http://priceline.com/ +http://urbandictionary.com/ +http://shaadi.com/ +http://blogspot.com.ar/ +http://6.cn/ +http://magentocommerce.com/ +http://cloob.com/ +http://52pk.net/ +http://realclearpolitics.com/ +http://alarabiya.net/ +http://hsbc.co.uk/ +http://discreethearts.com/ +http://ucoz.com/ +http://earthlink.net/ +http://novinky.cz/ +http://citrixonline.com/ +http://orf.at/ +http://masrawy.com/ +http://smh.com.au/ +http://way2sms.com/ +http://cmbchina.com/ +http://yihaodian.com/ +http://zappos.com/ +http://blackberry.com/ +http://fotostrana.ru/ +http://verycd.com/ +http://farsnews.com/ +http://gumtree.com/ +http://rightmove.co.uk/ +http://patch.com/ +http://ppstream.com/ +http://vente-privee.com/ +http://google.com.kw/ +http://nudevista.com/ +http://forgeofempires.com/ +http://hypergames.net/ +http://alot.com/ +http://softlayer.com/ +http://slutload.com/ +http://overstock.com/ +http://google.bg/ +http://geocities.jp/ +http://foursquare.com/ +http://bbc.com/ +http://statscrop.com/ +http://freakshare.com/ +http://lowes.com/ +http://h2porn.com/ +http://subito.it/ +http://japanpost.jp/ +http://quickmeme.com/ +http://npr.org/ +http://mercadolibre.com.ve/ +http://onlylady.com/ +http://ebay.ca/ +http://bahn.de/ +http://bartarinha.ir/ +http://xici.net/ +http://egotastic.com/ +http://yoka.com/ +http://google.com.ec/ +http://indianrail.gov.in/ +http://dmoz.org/ +http://gamespot.com/ +http://jabong.com/ +http://ci123.com/ +http://southwest.com/ +http://tenpay.com/ +http://baixing.com/ +http://scoop.it/ +http://telegraaf.nl/ +http://18schoolgirlz.com/ +http://adult-empire.com/ +http://eastday.com/ +http://tubegalore.com/ +http://posterous.com/ +http://cloudfront.net/ +http://rakuten.ne.jp/ +http://sky.com/ +http://linternaute.com/ +http://mysql.com/ +http://baomihua.com/ +http://goo.gl/ +http://perfectgirls.net/ +http://logmein.com/ +http://classmates.com/ +http://udn.com/ +http://akhbarak.net/ +http://115.com/ +http://allocine.fr/ +http://onlinesbi.com/ +http://payza.com/ +http://google.com.do/ +http://marktplaats.nl/ +http://pcmag.com/ +http://discuz.net/ +http://foodnetwork.com/ +http://www.net.cn/ +http://kdnet.net/ +http://rottentomatoes.com/ +http://cheshi.com.cn/ +http://zoho.com/ +http://skycn.com/ +http://subscene.com/ +http://google.com.qa/ +http://skyrock.com/ +http://easyhits4u.com/ +http://motherless.com/ +http://free-tv-video-online.me/ +http://steampowered.com/ +http://idealo.de/ +http://mail.com/ +http://friv.com/ +http://kayak.com/ +http://wetter.com/ +http://bankmellat.ir/ +http://zoosk.com/ +http://opensiteexplorer.org/ +http://streamate.com/ +http://dreamstime.com/ +http://logsoku.com/ +http://theblaze.com/ +http://filecrop.com/ +http://icontact.com/ +http://tjosurveys.com/ +http://weather.com.cn/ +http://grindtv.com/ +http://ahram.org.eg/ +http://crsky.com/ +http://meilishuo.com/ +http://legacy.com/ +http://lady8844.com/ +http://jeuxvideo.com/ +http://partypoker.com/ +http://sanook.com/ +http://nikkansports.com/ +http://semrush.com/ +http://babytree.com/ +http://cracked.com/ +http://m-w.com/ +http://bigpoint.com/ +http://asos.com/ +http://mediaset.it/ +http://hc360.com/ +http://cocoren.com/ +http://bhaskar.com/ +http://last.fm/ +http://88db.com/ +http://weblio.jp/ +http://onlinedown.net/ +http://sponichi.co.jp/ +http://realtor.com/ +http://ce.cn/ +http://sbrf.ru/ +http://meetcheap.com/ +http://hm.com/ +http://homeshop18.com/ +http://ticketmaster.com/ +http://slate.com/ +http://prestashop.com/ +http://boston.com/ +http://traidnt.net/ +http://grooveshark.com/ +http://justin.tv/ +http://biblegateway.com/ +http://speedbit.com/ +http://twitch.tv/ +http://clarin.com/ +http://brazzers.com/ +http://dhl.de/ +http://pornoxo.com/ +http://gismeteo.ru/ +http://accountonline.com/ +http://cnr.cn/ +http://yimg.com/ +http://r7.com/ +http://xgo.com.cn/ +http://qip.ru/ +http://19lou.com/ +http://subscribe.ru/ +http://meituan.com/ +http://esporte.uol.com.br/ +http://arpg2.com/ +http://jxliu.com/ +http://admagnet.net/ +http://freeones.com/ +http://lacaixa.es/ +http://mtime.com/ +http://shutterfly.com/ +http://piriform.com/ +http://flippa.com/ +http://rt.com/ +http://reverso.net/ +http://liveperson.net/ +http://eyny.com/ +http://eonline.com/ +http://beemp3.com/ +http://commbank.com.au/ +http://caixa.gov.br/ +http://android.com/ +http://sendspace.com/ +http://xbox.com/ +http://liveleak.com/

1 0

[ooni-probe/master] Update NetTest tests to reflect change of syntax
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 62f544aae5eca8818d26dc8e3a7f15402aeb923d Author: aagbsn <aagbsn(a)extc.org> Date: Thu Feb 28 14:02:16 2013 +0100 Update NetTest tests to reflect change of syntax --- tests/test_nettest.py | 54 ++++++++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/tests/test_nettest.py b/tests/test_nettest.py index 5645dbf..a0ccb32 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -124,8 +124,8 @@ class TestNetTest(unittest.TestCase): f.write(net_test_string) f.close() - ntl = NetTestLoader(net_test_file, - dummyArgs) + options = {'subargs':dummyArgs, 'test':net_test_file} + ntl = NetTestLoader(options) self.verifyMethods(ntl.testCases) os.unlink(net_test_file) @@ -134,8 +134,8 @@ class TestNetTest(unittest.TestCase): Given a file like object verify that the net test cases are properly generated. """ - ntl = NetTestLoader(net_test_string, - dummyArgs) + options = {'subargs':dummyArgs, 'test':net_test_string} + ntl = NetTestLoader(options) self.verifyMethods(ntl.testCases) def test_load_net_test_from_StringIO(self): @@ -143,41 +143,46 @@ class TestNetTest(unittest.TestCase): Given a file like object verify that the net test cases are properly generated. """ - ntl = NetTestLoader(StringIO(net_test_string), - dummyArgs) + options = {'subargs':dummyArgs, 'test':StringIO(net_test_string)} + ntl = NetTestLoader(options) self.verifyMethods(ntl.testCases) def test_load_with_option(self): - ntl = NetTestLoader(StringIO(net_test_string), - dummyArgs) + options = {'subargs':dummyArgs, 'test':StringIO(net_test_string)} + ntl = NetTestLoader(options) self.assertIsInstance(ntl, NetTestLoader) for test_klass, test_meth in ntl.testCases: for option in dummyOptions.keys(): self.assertIn(option, test_klass.usageOptions()) def test_load_with_invalid_option(self): + options = {'subargs':dummyInvalidArgs, + 'test':StringIO(net_test_string)} try: - ntl = NetTestLoader(StringIO(net_test_string), dummyInvalidArgs) + ntl = NetTestLoader(options) ntl.checkOptions() raise Exception except UsageError: pass def test_load_with_required_option(self): - net_test = NetTestLoader(StringIO(net_test_with_required_option), - dummyArgsWithRequiredOptions) + options = {'subargs':dummyArgsWithRequiredOptions, + 'test':StringIO(net_test_with_required_option)} + net_test = NetTestLoader(options) self.assertIsInstance(net_test, NetTestLoader) def test_load_with_missing_required_option(self): + options = {'subargs':dummyArgs, + 'test':StringIO(net_test_with_required_option)} try: - net_test = NetTestLoader(StringIO(net_test_with_required_option), - dummyArgs) + net_test = NetTestLoader(options) except MissingRequiredOption: pass def test_net_test_inputs(self): - ntl = NetTestLoader(StringIO(net_test_string_with_file), - dummyArgsWithFile) + options = {'subargs':dummyArgsWithFile, + 'test':StringIO(net_test_string_with_file)} + ntl = NetTestLoader(options) ntl.checkOptions() # XXX: if you use the same test_class twice you will have consumed all @@ -189,8 +194,8 @@ class TestNetTest(unittest.TestCase): self.assertEqual(len(list(test_class.inputs)), 10) def test_setup_local_options_in_test_cases(self): - ntl = NetTestLoader(StringIO(net_test_string), - dummyArgs) + options = {'subargs':dummyArgs, 'test':StringIO(net_test_string)} + ntl = NetTestLoader(options) ntl.checkOptions() for test_class, test_method in ntl.testCases: @@ -198,8 +203,9 @@ class TestNetTest(unittest.TestCase): def test_generate_measurements_size(self): - ntl = NetTestLoader(StringIO(net_test_string_with_file), - dummyArgsWithFile) + options = {'subargs':dummyArgsWithFile, + 'test':StringIO(net_test_string_with_file)} + ntl = NetTestLoader(options) ntl.checkOptions() net_test = NetTest(ntl, None) @@ -207,8 +213,9 @@ class TestNetTest(unittest.TestCase): self.assertEqual(len(measurements), 20) def test_net_test_completed_callback(self): - ntl = NetTestLoader(StringIO(net_test_string_with_file), - dummyArgsWithFile) + options = {'subargs':dummyArgsWithFile, + 'test':StringIO(net_test_string_with_file)} + ntl = NetTestLoader(options) ntl.checkOptions() director = Director() @@ -224,8 +231,9 @@ class TestNetTest(unittest.TestCase): def test_require_root_succeed(self): #XXX: will require root to run - ntl = NetTestLoader(StringIO(net_test_root_required), - dummyArgs) + options = {'subargs':dummyArgs, + 'test':StringIO(net_test_root_required)} + ntl = NetTestLoader(options) for test_class, method in ntl.testCases: self.assertTrue(test_class.requiresRoot)

1 0

[ooni-probe/master] Update tests to reflect change of syntax in NetTestLoader
by isis＠torproject.org 10 Mar '13

10 Mar '13

commit 845c33254e5ca972d7d33c01d4681442a2c2f5e2 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Feb 28 14:14:13 2013 +0100 Update tests to reflect change of syntax in NetTestLoader --- tests/test_director.py | 3 ++- tests/test_managers.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_director.py b/tests/test_director.py index 484cb21..79a1e96 100644 --- a/tests/test_director.py +++ b/tests/test_director.py @@ -42,7 +42,8 @@ class TestDirector(unittest.TestCase): pass def test_start_net_test(self): - net_test_loader = NetTestLoader(net_test_string, dummyArgs) + options = {'test':net_test_string, 'subargs':dummyArgs} + net_test_loader = NetTestLoader(options) net_test_loader.checkOptions() d = self.director.startNetTest('', net_test_loader, self.reporters) diff --git a/tests/test_managers.py b/tests/test_managers.py index 601e305..39f0881 100644 --- a/tests/test_managers.py +++ b/tests/test_managers.py @@ -194,7 +194,7 @@ class TestMeasurementManager(unittest.TestCase): @mock_task.done.addCallback def done(res): self.assertEqual(self.mockNetTest.successes, - [mock_task]) + [42]) self.assertEqual(len(self.mockNetTest.successes), 1) return mock_task.done

1 0