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

Added test that files exist to etc/ci/check_no_unwrap.sh. #11251

Merged
merged 1 commit into from May 19, 2016

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented May 18, 2016

Thank you for contributing to Servo! Please replace each [ ] by [X] when the step is complete, and replace __ with appropriate data:

  • ./mach build -d does not report any errors
  • ./mach test-tidy --faster does not report any errors
  • No github issue.

Either:

  • There are tests for these changes OR
  • These changes do not require tests because this PR updates test code.

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.


This change is Reviewable

@highfive
Copy link

highfive commented May 18, 2016

Heads up! This PR modifies the following files:

@asajeffrey
Copy link
Member Author

asajeffrey commented May 18, 2016

Should land after #11249.

cc @Ms2ger @nox @aneeshusa

ls -1 "${FILES[@]}"

# make sure the files do not contain "unwrap" or "panic!"
! grep -Hn "unwrap(\|panic!(" "${FILES[@]}"

This comment has been minimized.

@aneeshusa

aneeshusa May 18, 2016

Member

-H is the default when there is more than one file to search, so it's redundant here.

This comment has been minimized.

@asajeffrey

asajeffrey May 18, 2016

Author Member

True, I guess I prefer being explicit. I can remove it if you think it's confusing.

This comment has been minimized.

@aneeshusa

aneeshusa May 18, 2016

Member

In that case, I think using long options would be better here. I've never seen -H used and had to look it up, and might as well spell out -n as well.

This comment has been minimized.

@asajeffrey

asajeffrey May 18, 2016

Author Member

Done.

@asajeffrey
Copy link
Member Author

asajeffrey commented May 18, 2016

Yay, the build is failing like it should!:

$ bash etc/ci/check_no_unwrap.sh
ls: cannot access components/compositing/constellation.rs: No such file or directory
components/compositing/compositor.rs
components/compositing/pipeline.rs
The command "bash etc/ci/check_no_unwrap.sh" exited with 2.

https://travis-ci.org/servo/servo/jobs/131179631#L1701

@highfive
Copy link

highfive commented May 18, 2016

New code was committed to pull request.

@@ -17,4 +17,4 @@ FILES=("components/compositing/compositor.rs"
ls -1 "${FILES[@]}"

# make sure the files do not contain "unwrap" or "panic!"
! grep -Hn "unwrap(\|panic!(" "${FILES[@]}"
! grep --line-number --with-filename "unwrap(\|panic(" "${FILES[@]}"

This comment has been minimized.

@aneeshusa

aneeshusa May 18, 2016

Member

Why remove the exclamation point in panic!(? That seems wrong.

@aneeshusa
Copy link
Member

aneeshusa commented May 18, 2016

Argh, for some reason GitHub is showing my last comment as outdated. I'll repeat it here:

Why remove the exclamation point in panic!(? That seems wrong.

@highfive
Copy link

highfive commented May 18, 2016

New code was committed to pull request.

@asajeffrey
Copy link
Member Author

asajeffrey commented May 18, 2016

Oops, added the exclamation point back in.

ls -1 "${FILES[@]}"

# make sure the files do not contain "unwrap" or "panic!"
! grep --line-number --with-filename "unwrap(\|panic!(" "${FILES[@]}"

This comment has been minimized.

@aneeshusa

aneeshusa May 19, 2016

Member

style nit: There's an extra space between --with-filename and "unwrap(\panic!(".

@aneeshusa
Copy link
Member

aneeshusa commented May 19, 2016

r=me after fixing the spacing there and squashing.

@asajeffrey
Copy link
Member Author

asajeffrey commented May 19, 2016

Thanks! I'll r=you after I fix, squash, and #11249 has been r+d by some kind soul (hint hint).

@aneeshusa
Copy link
Member

aneeshusa commented May 19, 2016

Looks like @KiChjang beat me to it.

@asajeffrey
Copy link
Member Author

asajeffrey commented May 19, 2016

Yay!

@asajeffrey asajeffrey force-pushed the asajeffrey:check-no-unwrap-check-for-files branch from 4d1ae9f to a6990b2 May 19, 2016
@highfive
Copy link

highfive commented May 19, 2016

New code was committed to pull request.

@asajeffrey
Copy link
Member Author

asajeffrey commented May 19, 2016

@bors-servo r=aneeshusa

@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2016

📌 Commit a6990b2 has been approved by aneeshusa

@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2016

Testing commit a6990b2 with merge 2d5dc8f...

bors-servo added a commit that referenced this pull request May 19, 2016
…aneeshusa

Added test that files exist to etc/ci/check_no_unwrap.sh.

Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data:
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy --faster` does not report any errors
- [X] No github issue.

Either:
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because this PR updates test code.

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11251)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2016

@bors-servo bors-servo merged commit a6990b2 into servo:master May 19, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
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

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