FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Revert 27962 by sam-github · Pull Request #28083 · nodejs/node · GitHub

/ node Public

Revert 27962 - #28083

Closed
sam-github wants to merge 17 commits into
nodejs:masterfrom
sam-github:revert-27962
ConversationCommits (17)ChecksFiles changed
Closed

Revert 27962#28083
sam-github wants to merge 17 commits into
nodejs:masterfrom
sam-github:revert-27962

Conversation

sam-github commented Jun 5, 2019

Copy link
Copy Markdown
Contributor
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

sam-github added 17 commits June 5, 2019 15:19
Revert "test: add comments to the foaf+ssl fixtures"
5f723c8 
This reverts commit 39d6da8.
Revert "test: change formatting of fixtures/keys/Makefile"
5c8d544 
This reverts commit 2abaa1a.
Revert "test: change fixtures.readSync to fixtures.readKey"
3370473 
This reverts commit f212fee.
Revert "test: remove uneeded agent keypair in fixtures/"
743e752 
This reverts commit 3e5b20c.
Revert "test: move foafssl certs to fixtures/keys/"
81e5107 
This reverts commit 7aa79be.
Revert "test: remove uneeded alice certs in fixtures/"
d34118a 
This reverts commit c49e378.
Revert "test: remove uneeded certs in fixtures/"
d9a1925 
This reverts commit 6925f41.
Revert "test: move dherror.pem to fixtures/keys/"
cf7ae4b 
This reverts commit b422561.
Revert "test: remove pass-* certs"
f3ff4e4 
This reverts commit 6adeae6.
Revert "test: move test_[key|ca|cert] to fixtures/keys/"
1eb400a 
This reverts commit 5d08697.
Revert "test: move spkac certs to fixtures/keys/"
0a680b9 
This reverts commit b250085.
Revert "test: move x448 keypairs to fixtures/keys/"
f275445 
This reverts commit 198162a.
Revert "test: move ed448 keypairs to fixtures/keys/"
e86aae8 
This reverts commit c420972.
Revert "test: move dsa keypairs to fixtures/keys/"
0847f6f 
This reverts commit f5e6ac2.
Revert "test: move rsa keypairs to fixtures/keys/"
1d03c42 
This reverts commit 56d3383.
Revert "test: move x25519 keypair to fixtures/keys/"
833b529 
This reverts commit ee00111.
Revert "test: move ed25519 keypair to fixtures/keys/"
cfae6ca 
This reverts commit 8091df0.
sam-github mentioned this pull request Jun 5, 2019
Closed
2 tasks

nodejs-github-bot commented Jun 5, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23644/

sam-github commented Jun 5, 2019

Copy link
Copy Markdown
Contributor Author

I suggest this be fast-tracked when it passes CI, it fixes test failures introduced in #27962

Please thumbs-up this if you agree.

addaleax approved these changes Jun 5, 2019
View reviewed changes

addaleax left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

👍 to fast-tracking

sam-github added the fast-track PRs that do not need to wait for 48 hours to land. label Jun 5, 2019
addaleax added the test Issues and PRs related to the tests. label Jun 5, 2019

sam-github commented Jun 5, 2019

Copy link
Copy Markdown
Contributor Author

As a heads-up, I won't be available for a couple hours to land this, so if it gets some fasttrack votes and passes CI, anyone who has the time feel free to land it.

refack pushed a commit to refack/node that referenced this pull request Jun 5, 2019
Revert "test: move all test keys/certs under test/fixtures/keys/"
965ffc4 
PR-URL: nodejs#28083
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Refael Ackermann (רפאל פלחי) <refack@gmail.com>

refack commented Jun 5, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor

Fast-track landed in 965ffc4

refack closed this Jun 5, 2019

nodejs-github-bot commented Jun 5, 2019

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/23645/

refack commented Jun 5, 2019 •
edited
Loading

Copy link
Copy Markdown
Contributor

https://ci.nodejs.org/job/node-test-commit/29189/ ✔️

Re running CI since there seems to get some git whitespace artifacts when rebasing.

 test/fixtures/msca.pem | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/fixtures/msca.pem b/test/fixtures/msca.pem
index 247368e625..82ae5e1bec 100644
--- a/test/fixtures/msca.pem
+++ b/test/fixtures/msca.pem
CRLF->LF

 test/fixtures/foafssl.key | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/foafssl.key b/test/fixtures/foafssl.key
index 62e953a67f..facbec5541 100644
--- a/test/fixtures/foafssl.key
+++ b/test/fixtures/foafssl.key
@@ -1,6 +1,6 @@
 Bag Attributes
     friendlyName: Me's Not a Certification Authority ID
-    localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A 
+    localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
 MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCm9EqcJXkUMSFP

 test/fixtures/foafssl.crt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/foafssl.crt b/test/fixtures/foafssl.crt
index f4b5905e37..4a95dcd714 100644
--- a/test/fixtures/foafssl.crt
+++ b/test/fixtures/foafssl.crt
@@ -1,6 +1,6 @@
 Bag Attributes
     friendlyName: Me's Not a Certification Authority ID
-    localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A 
+    localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A
 subject=/O=FOAF+SSL/OU=The Community Of Self Signers/UID=http://example.com/#me/CN=Me
 issuer=/O=FOAF+SSL/OU=The Community of Self Signers/CN=Not a Certification Authority
 -----BEGIN CERTIFICATE-----

sam-github deleted the revert-27962 branch June 6, 2019 00:08

sam-github commented Jun 6, 2019

Copy link
Copy Markdown
Contributor Author

thanks @refack

BridgeAR pushed a commit that referenced this pull request Jun 17, 2019
Revert "test: move all test keys/certs under test/fixtures/keys/"
62de36e 
PR-URL: #28083
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Refael Ackermann (רפאל פלחי) <refack@gmail.com>
BridgeAR mentioned this pull request Jun 17, 2019
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

addaleax addaleax approved these changes
trivikr trivikr approved these changes
+2 more reviewers
ofrobots ofrobots approved these changes
refack refack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

fast-track PRs that do not need to wait for 48 hours to land. test Issues and PRs related to the tests.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

Back | FazBrowse Home | New Git URL