c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(probeservices): use api.ooni.io (#926)

Browse source 
See https://github.com/ooni/probe/issues/2147.

Note that this PR also tries to reduce usage of legacy names inside unit/integration tests.
This commit is contained in:
Simone Basso 2022-09-02 16:48:14 +02:00 • committed by GitHub
commit 7df25795c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 35 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
QA/webconnectivity.py
View file

@ -50,8 +50,6 @@ def assert_status_flags_are(ooni_exe, tk, desired):
def webconnectivity_https_ok_with_control_failure(ooni_exe, outfile):
"""Successful HTTPS measurement but control failure."""
args = [
"-iptables-reset-keyword",
"wcth.ooni.io",
"-iptables-reset-keyword",
"th.ooni.org",
]
@ -83,8 +81,6 @@ def webconnectivity_https_ok_with_control_failure(ooni_exe, outfile):
def webconnectivity_http_ok_with_control_failure(ooni_exe, outfile):
"""Successful HTTP measurement but control failure."""
args = [
"-iptables-reset-keyword",
"wcth.ooni.io",
"-iptables-reset-keyword",
"th.ooni.org",
]
@ -194,8 +190,6 @@ def webconnectivity_control_unreachable_and_using_http(ooni_exe, outfile):
plaintext HTTP protocol rather than HTTPS"""
args = []
args.append("-iptables-reset-keyword")
args.append("wcth.ooni.io")
args.append("-iptables-reset-keyword")
args.append("th.ooni.org")
tk = execute_jafar_and_return_validated_test_keys(
ooni_exe,
@ -224,7 +218,7 @@ def webconnectivity_nonexistent_domain(ooni_exe, outfile):
tk = execute_jafar_and_return_validated_test_keys(
ooni_exe,
outfile,
"-i http://antani.ooni.io web_connectivity",
"-i http://www.ooni.nonexistent web_connectivity",
"webconnectivity_nonexistent_domain",
args,
)