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.

Sign up for GitHub

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

Jump to bottom

mitmproxy: 3.0.4 -> 4.0.4, fix tests #46585

Merged
merged 1 commit into from Sep 13, 2018
Merged

mitmproxy: 3.0.4 -> 4.0.4, fix tests #46585

merged 1 commit into from Sep 13, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Sep 12, 2018

Motivation for this change

ZHF #45960 . Previous version was broken, tests failed:

  • update to latest release
  • add missing checkInputs
  • apply upstream patch to fix some tests that failed due to expired test ssl certs
  • re-enable a previously disabled test case
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

cc @fpletz @kamilchm

@xeji
mitmproxy: 3.0.4 -> 4.0.4, fix tests
580797c 
- add missing checkInputs
- apply upstream patch to fix some tests that failed due to
  expired test ssl certs
- re-enable a previously disabled test case
@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: mitmproxy

Partial log (click to expand)

strip is /nix/store/df6k4mgdjxciy0f637lryp7c9ln7n1m3-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4/lib  /nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4/bin
patching script interpreter paths in /nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4
/nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4/lib/python3.6/site-packages/mitmproxy/contrib/kaitaistruct/make.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/cblfnvb5rmhd2z231mqasn0brzh1hhv4-bash-4.4-p23/bin/bash"
wrapping `/nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4/bin/mitmdump'...
wrapping `/nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4/bin/mitmproxy'...
wrapping `/nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4/bin/mitmweb'...
wrapping `/nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4/bin/pathoc'...
wrapping `/nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4/bin/pathod'...
/nix/store/61hw0lsikmk639zxjz4z43gx85aqsdrg-python3.6-mitmproxy-4.0.4

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: mitmproxy

Partial log (click to expand)

test/release/test_cibuild.py ..................

=============================== warnings summary ===============================
test/mitmproxy/utils/test_debug.py::test_dump_info
  /build/source/mitmproxy/utils/debug.py:70: RuntimeWarning: coroutine 'Script.watcher' was never awaited
    gc.collect()

-- Docs: https://docs.pytest.org/en/latest/warnings.html
============ 1392 passed, 1 deselected, 1 warnings in 86.55 seconds ============
/nix/store/n4m94adnz40abbcjy7r0ad2irqhjxdl4-python3.6-mitmproxy-4.0.4

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: mitmproxy

Partial log (click to expand)

test/release/test_cibuild.py ..................

=============================== warnings summary ===============================
test/mitmproxy/tools/console/test_defaultkeys.py::test_commands_exist
  /build/source/mitmproxy/optmanager.py:110: RuntimeWarning: coroutine 'Script.watcher' was never awaited
    self.changed.send(self, updated={name})

-- Docs: https://docs.pytest.org/en/latest/warnings.html
=========== 1392 passed, 1 deselected, 1 warnings in 214.24 seconds ============
/nix/store/8lfvk243209wyz04sj1lqbylcal2avic-python3.6-mitmproxy-4.0.4

fpletz
fpletz approved these changes Sep 13, 2018
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Thanks!

@fpletz fpletz merged commit d225a91 into NixOS:master Sep 13, 2018
@xeji xeji deleted the p/mitmproxy branch September 13, 2018 00:11
@xeji
Copy link
Contributor Author

xeji commented Sep 13, 2018

backported: b55e305

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@xeji @GrahamcOfBorg @fpletz