Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Strip invalid tcp_connect fields in the web_connectivity test helper #101

Merged
merged 4 commits into from
Jan 26, 2017

Conversation

hellais
Copy link
Member

@hellais hellais commented Jan 26, 2017

This is the ooni-backend side fix of:
https://github.com/TheTorProject/ooni-probe/issues/727

@coveralls
Copy link

Coverage Status

Coverage increased (+80.9%) to 80.941% when pulling 55b50a1 on fix/727 into bdf9dfe on master.

@coveralls
Copy link

Coverage Status

Coverage increased (+80.9%) to 80.941% when pulling 962ef58 on fix/727 into bdf9dfe on master.

collector:
httpo://ihiderha53f36lsd.onion:
collector-alternate:
- {address: 'https://a.collector.ooni.io:4441', type: https}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://b.collector.ooni.io?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually the canonical bouncer is currently using this address. Though anyways what is in here doesn't really matter for the purpose of the unittest.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I don't think it's relevant, however)

web-connectivity: 'httpo://7jne2rpg5lsaqs6b.onion'}
test-helper-alternate:
web-connectivity:
- {address: 'https://a.web-connectivity.th.ooni.io:4442', type: https}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC https://b.web-connectivity.th.ooni.io?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same thing as above. The canonical bouncer is still advertising the old address. We should switch it though when we update to the version in here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(ditto)

Copy link
Member

@bassosimone bassosimone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the diff looks good to me

@hellais hellais merged commit 5944c10 into master Jan 26, 2017
@hellais hellais deleted the fix/727 branch January 26, 2017 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants