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

M1502: Improve HTTP monitoring devtool support #8216

Merged
merged 2 commits into from Nov 5, 2015

Conversation

@akumar21NCSU
Copy link

akumar21NCSU commented Oct 27, 2015

Review on Reviewable

@highfive
Copy link

highfive commented Oct 27, 2015

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @jdm (or someone else) soon.

@jdm
Copy link
Member

jdm commented Oct 27, 2015

Great work! Most of my comments that I've left are style issues or things that could be written more clearly!
-S-awaiting-review +S-needs-code-changes


Reviewed 9 of 9 files at r1, 2 of 2 files at r2, 1 of 1 files at r3, 4 of 4 files at r4, 1 of 1 files at r5, 1 of 1 files at r6, 2 of 2 files at r7, 2 of 2 files at r8.
Review status: all files reviewed at latest revision, 11 unresolved discussions, some commit checks failed.


components/net/http_loader.rs, line 5 [r1] (raw file):
Let's move this to lib.rs with the other ones.


components/net/http_loader.rs, line 42 [r1] (raw file):
This doesn't need the self:: with the previous change.


components/net/http_loader.rs, line 597 [r7] (raw file):
Let's remove this comment.


components/net/http_loader.rs, line 603 [r7] (raw file):
These three lines of arguments should be indented by four spaces.


components/net/http_loader.rs, line 449 [r8] (raw file):
Let's style this like:

let request = DevtoolsHttpRequest {
    url: url, method: method, headers: headers, body: body, pipeline_id: pipeline_id
};

tests/unit/net/http_loader.rs, line 5 [r4] (raw file):
Let's move this to lib.rs with the others.


tests/unit/net/http_loader.rs, line 30 [r4] (raw file):
Remove self:: after the previous change.


tests/unit/net/http_loader.rs, line 388 [r4] (raw file):
No need for this local value; just inline Some(pipeline_id) in the next line.


tests/unit/net/http_loader.rs, line 459 [r4] (raw file):
No need to clone here, and we can just inline None instead of creating the optional value.


tests/unit/net/http_loader.rs, line 461 [r4] (raw file):
This isn't necessary in this test. We can use the default headers in the LoadData value.


tests/unit/net/http_loader.rs, line 468 [r8] (raw file):
This can be assert!(devtools_port.try_recv().is_error()).


Comments from the review on Reviewable.io

@bors-servo
Copy link
Contributor

bors-servo commented Oct 29, 2015

The latest upstream changes (presumably #8244) made this pull request unmergeable. Please resolve the merge conflicts.

@jdm
Copy link
Member

jdm commented Oct 30, 2015

Lovely! We just need to clean up the remaining errors from ./mach test-tidy, and squash all the changes into one.
-S-awaiting-review -S-needs-rebase +S-fails-tidy +S-needs-squash


Reviewed 9 of 9 files at r9.
Review status: all files reviewed at latest revision, all discussions resolved, some commit checks failed.


Comments from the review on Reviewable.io

@akumar21NCSU akumar21NCSU force-pushed the akumar21NCSU:master branch from af3c419 to 9c6374d Oct 30, 2015
@jdm
Copy link
Member

jdm commented Nov 2, 2015

@bors-servo: r+


Reviewed 4 of 4 files at r10.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from the review on Reviewable.io

@bors-servo
Copy link
Contributor

bors-servo commented Nov 2, 2015

📌 Commit 9c6374d has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 3, 2015

Testing commit 9c6374d with merge 5646871...

bors-servo added a commit that referenced this pull request Nov 3, 2015
M1502: Improve HTTP monitoring devtool support



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8216)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 3, 2015

💔 Test failed - mac-dev-ref-unit

@eefriedman
Copy link
Contributor

eefriedman commented Nov 3, 2015

---- http_loader::test_request_and_response_data_with_network_messages stdout ----
    thread 'http_loader::test_request_and_response_data_with_network_messages' panicked at 'assertion failed: `(left == right)` (left: `HttpRequest { url: Url { scheme: "https", scheme_data: Relative(RelativeSchemeData { username: "", password: None, host: Domain("mozilla.com"), port: None, default_port: Some(443), path: [""] }), query: None, fragment: None }, method: Get, headers: Headers { User-Agent: Test-agent, Accept: text/html, application/xhtml+xml, application/xml; q=0.9, */*; q=0.8, Accept-Encoding: gzip, deflate, br, Host: mozilla.com, }, body: None, pipeline_id: PipelineId { namespace_id: PipelineNamespaceId(0), index: PipelineIndex(0) } }`, right: `HttpRequest { url: Url { scheme: "https", scheme_data: Relative(RelativeSchemeData { username: "", password: None, host: Domain("mozilla.com"), port: None, default_port: Some(443), path: [""] }), query: None, fragment: None }, method: Get, headers: Headers { User-Agent: Test-agent, Host: mozilla.com, Accept-Encoding: gzip, deflate, Accept: text/html, application/xhtml+xml, application/xml; q=0.9, */*; q=0.8, }, body: None, pipeline_id: PipelineId { namespace_id: PipelineNamespaceId(0), index: PipelineIndex(0) } }`)', /Users/servo/buildbot/slave/mac-dev-ref-unit/build/tests/unit/net/http_loader.rs:433
stack backtrace:
   1:        0x102115d28 - sys::backtrace::tracing::imp::write::h662793599f713c74T5s
   2:        0x10211782f - panicking::log_panic::_<closure>::closure.38923
   3:        0x1021172fc - panicking::log_panic::h87af6096e0b6fa7c4Uw
   4:        0x1021097b6 - sys_common::unwind::begin_unwind_inner::h1e338bc64cf56d9dr8r
   5:        0x102109b9e - sys_common::unwind::begin_unwind_fmt::he992719329bdd2c6x7r
   6:        0x101e1578b - http_loader::test_request_and_response_data_with_network_messages::h4823d798daf0308cVRc
   7:        0x1020b8edb - boxed::_<impl>::call_box::call_box::h1439439458556714188
   8:        0x1020bb62d - boxed::_<impl>::call_box::call_box::h8069092559954270103
   9:        0x1020b9832 - sys_common::unwind::try::try_fn::try_fn::h11324081254561251759
  10:        0x1021151f8 - __rust_try
  11:        0x102112dce - sys_common::unwind::try::inner_try::hc13d8e198528cd0fZ4r
  12:        0x1020b99e2 - boxed::_<impl>::call_box::call_box::h6022582708213645161
  13:        0x102116bfd - sys::thread::_<impl>::new::thread_start::h906ddce3a93d4852ksw
  14:     0x7fff8416a059 - _pthread_body
  15:     0x7fff84169fd6 - _pthread_start


failures:
    http_loader::test_request_and_response_data_with_network_messages

test result: FAILED. 149 passed; 1 failed; 0 ignored; 0 measured
akumar21 added 2 commits Oct 21, 2015
Adding pipelineID to httpresponse message, clearner code for task1

Commit for Refactored task

Unit tests

Removing extra whitespaces.

Removing extra whitespaces.

Removing tabs whitespaces

Making Code tidier.

Style issues Fix

Test-tidy Fixes
@akumar21NCSU akumar21NCSU force-pushed the akumar21NCSU:master branch from b1caaa6 to de4f8ea Nov 5, 2015
@akumar21NCSU
Copy link
Author

akumar21NCSU commented Nov 5, 2015

@jdm Thanks. I have changed default headers accordingly.

@jdm
Copy link
Member

jdm commented Nov 5, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

📌 Commit de4f8ea has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

Testing commit de4f8ea with merge 742cc29...

bors-servo added a commit that referenced this pull request Nov 5, 2015
M1502: Improve HTTP monitoring devtool support

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8216)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

💔 Test failed - mac-rel-wpt

@jdm
Copy link
Member

jdm commented Nov 5, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

Testing commit de4f8ea with merge 7151d8a...

bors-servo added a commit that referenced this pull request Nov 5, 2015
M1502: Improve HTTP monitoring devtool support

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8216)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

💔 Test failed - mac-rel-wpt

@jdm
Copy link
Member

jdm commented Nov 5, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

Testing commit de4f8ea with merge 45f07ec...

bors-servo added a commit that referenced this pull request Nov 5, 2015
M1502: Improve HTTP monitoring devtool support

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8216)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 5, 2015

@bors-servo bors-servo merged commit de4f8ea into servo:master Nov 5, 2015
2 of 3 checks passed
2 of 3 checks passed
code-review/reviewable Review in progress: 4 of 13 files reviewed, all discussions resolved
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.