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

Remove string literal #19276

Closed
wants to merge 1 commit into from

Conversation

Nate-weeks
Copy link
Contributor

@Nate-weeks Nate-weeks commented Mar 10, 2018

Edited several calls to assert.strictEqual in test-crypto-sign-verify.js. I removed third argument string literals that hid the value of verified. The default message should include the values.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@nodejs-github-bot nodejs-github-bot added the test Issues and PRs related to the tests. label Mar 10, 2018
Copy link
Contributor

@ryzokuken ryzokuken left a comment

Choose a reason for hiding this comment

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

LGTM

@BridgeAR
Copy link
Member

@Nate-weeks would you be so kind and rebase instead of using merge? :-) otherwise it is not possible to run our CI. Even though in this specific case it is probably not necessary to run it.

@tniessen
Copy link
Member

@Nate-weeks Please rebase your changes on top of master instead of adding a merge commit if there are conflicts. In order to undo the merge commit and to properly rebase your changes, follow these steps.

# This is only necessary if you did not add the upstream remote before.
git remote add upstream https://github.com/nodejs/node.git

# Checkout your branch.
git checkout remove-string-literal
# Undo the merge commit.
git reset --hard 10d783c07ca5ac15f013b5bad3709e26cbef87f5
# Make sure your copy of our master branch is up-to-date.
git fetch upstream master
# Rebase on top of our changes.
git rebase upstream/master

git rebase will stop as soon as it encounters a conflict, at which point you will need to follow the instructions on the screen. It is usually a cycle of

  1. using git status to determine which files the conflict occurred in,
  2. manually resolving the conflicts,
  3. telling git that you are done with git add path/to/file/with/conflicts, and
  4. resuming the rebase with git rebase --continue.

@Nate-weeks Nate-weeks force-pushed the remove-string-literal branch from 81443e2 to 2f6d1db Compare March 15, 2018 00:15
@Nate-weeks
Copy link
Contributor Author

Oops, yeah sorry that took me awhile to get to and thanks for the instructions, is this better?

@tniessen
Copy link
Member

@trivikr
Copy link
Member

trivikr commented Mar 25, 2018

tniessen pushed a commit that referenced this pull request Mar 25, 2018
PR-URL: #19276
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Yuta Hiroto <hello@hiroppy.me>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@tniessen
Copy link
Member

Landed in 92de0eb, thank you @Nate-weeks! 🎉

@tniessen tniessen closed this Mar 25, 2018
targos pushed a commit that referenced this pull request Mar 27, 2018
PR-URL: #19276
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Yuta Hiroto <hello@hiroppy.me>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test Issues and PRs related to the tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.