From b88260045ae975d1d968c32cf313f72d3ba35517 Mon Sep 17 00:00:00 2001 From: Kelvin Jin Date: Thu, 1 Mar 2018 09:53:23 -0800 Subject: [PATCH] move interop tests back --- .../grpc-native-core/test/interop_sanity_test.js | 4 ++-- test/data/README | 1 + test/data/ca.pem | 15 +++++++++++++++ test/data/server1.key | 16 ++++++++++++++++ test/data/server1.pem | 16 ++++++++++++++++ .../interop/async_delay_queue.js | 0 .../interop/interop_client.js | 7 +++---- .../interop/interop_server.js | 9 ++++----- 8 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 test/data/README create mode 100644 test/data/ca.pem create mode 100644 test/data/server1.key create mode 100644 test/data/server1.pem rename {packages/grpc-native-core => test}/interop/async_delay_queue.js (100%) rename {packages/grpc-native-core => test}/interop/interop_client.js (99%) rename {packages/grpc-native-core => test}/interop/interop_server.js (96%) diff --git a/packages/grpc-native-core/test/interop_sanity_test.js b/packages/grpc-native-core/test/interop_sanity_test.js index b3f65a03..bc4c539a 100644 --- a/packages/grpc-native-core/test/interop_sanity_test.js +++ b/packages/grpc-native-core/test/interop_sanity_test.js @@ -18,8 +18,8 @@ 'use strict'; -var interop_server = require('../interop/interop_server.js'); -var interop_client = require('../interop/interop_client.js'); +var interop_server = require('../../../test/interop/interop_server.js'); +var interop_client = require('../../../test/interop/interop_client.js'); var server; diff --git a/test/data/README b/test/data/README new file mode 100644 index 00000000..888d95b9 --- /dev/null +++ b/test/data/README @@ -0,0 +1 @@ +CONFIRMEDTESTKEY diff --git a/test/data/ca.pem b/test/data/ca.pem new file mode 100644 index 00000000..6c8511a7 --- /dev/null +++ b/test/data/ca.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICSjCCAbOgAwIBAgIJAJHGGR4dGioHMA0GCSqGSIb3DQEBCwUAMFYxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX +aWRnaXRzIFB0eSBMdGQxDzANBgNVBAMTBnRlc3RjYTAeFw0xNDExMTEyMjMxMjla +Fw0yNDExMDgyMjMxMjlaMFYxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0 +YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxDzANBgNVBAMT +BnRlc3RjYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwEDfBV5MYdlHVHJ7 ++L4nxrZy7mBfAVXpOc5vMYztssUI7mL2/iYujiIXM+weZYNTEpLdjyJdu7R5gGUu +g1jSVK/EPHfc74O7AyZU34PNIP4Sh33N+/A5YexrNgJlPY+E3GdVYi4ldWJjgkAd +Qah2PH5ACLrIIC6tRka9hcaBlIECAwEAAaMgMB4wDAYDVR0TBAUwAwEB/zAOBgNV +HQ8BAf8EBAMCAgQwDQYJKoZIhvcNAQELBQADgYEAHzC7jdYlzAVmddi/gdAeKPau +sPBG/C2HCWqHzpCUHcKuvMzDVkY/MP2o6JIW2DBbY64bO/FceExhjcykgaYtCH/m +oIU63+CFOTtR7otyQAWHqXa7q4SbCDlG7DyRFxqG0txPtGvy12lgldA2+RgcigQG +Dfcog5wrJytaQ6UA0wE= +-----END CERTIFICATE----- diff --git a/test/data/server1.key b/test/data/server1.key new file mode 100644 index 00000000..143a5b87 --- /dev/null +++ b/test/data/server1.key @@ -0,0 +1,16 @@ +-----BEGIN PRIVATE KEY----- +MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAOHDFScoLCVJpYDD +M4HYtIdV6Ake/sMNaaKdODjDMsux/4tDydlumN+fm+AjPEK5GHhGn1BgzkWF+slf +3BxhrA/8dNsnunstVA7ZBgA/5qQxMfGAq4wHNVX77fBZOgp9VlSMVfyd9N8YwbBY +AckOeUQadTi2X1S6OgJXgQ0m3MWhAgMBAAECgYAn7qGnM2vbjJNBm0VZCkOkTIWm +V10okw7EPJrdL2mkre9NasghNXbE1y5zDshx5Nt3KsazKOxTT8d0Jwh/3KbaN+YY +tTCbKGW0pXDRBhwUHRcuRzScjli8Rih5UOCiZkhefUTcRb6xIhZJuQy71tjaSy0p +dHZRmYyBYO2YEQ8xoQJBAPrJPhMBkzmEYFtyIEqAxQ/o/A6E+E4w8i+KM7nQCK7q +K4JXzyXVAjLfyBZWHGM2uro/fjqPggGD6QH1qXCkI4MCQQDmdKeb2TrKRh5BY1LR +81aJGKcJ2XbcDu6wMZK4oqWbTX2KiYn9GB0woM6nSr/Y6iy1u145YzYxEV/iMwff +DJULAkB8B2MnyzOg0pNFJqBJuH29bKCcHa8gHJzqXhNO5lAlEbMK95p/P2Wi+4Hd +aiEIAF1BF326QJcvYKmwSmrORp85AkAlSNxRJ50OWrfMZnBgzVjDx3xG6KsFQVk2 +ol6VhqL6dFgKUORFUWBvnKSyhjJxurlPEahV6oo6+A+mPhFY8eUvAkAZQyTdupP3 +XEFQKctGz+9+gKkemDp7LBBMEMBXrGTLPhpEfcjv/7KPdnFHYmhYeBTBnuVmTVWe +F98XJ7tIFfJq +-----END PRIVATE KEY----- diff --git a/test/data/server1.pem b/test/data/server1.pem new file mode 100644 index 00000000..f3d43fcc --- /dev/null +++ b/test/data/server1.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICnDCCAgWgAwIBAgIBBzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJBVTET +MBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQ +dHkgTHRkMQ8wDQYDVQQDEwZ0ZXN0Y2EwHhcNMTUxMTA0MDIyMDI0WhcNMjUxMTAx +MDIyMDI0WjBlMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNV +BAcTB0NoaWNhZ28xFTATBgNVBAoTDEV4YW1wbGUsIENvLjEaMBgGA1UEAxQRKi50 +ZXN0Lmdvb2dsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOHDFSco +LCVJpYDDM4HYtIdV6Ake/sMNaaKdODjDMsux/4tDydlumN+fm+AjPEK5GHhGn1Bg +zkWF+slf3BxhrA/8dNsnunstVA7ZBgA/5qQxMfGAq4wHNVX77fBZOgp9VlSMVfyd +9N8YwbBYAckOeUQadTi2X1S6OgJXgQ0m3MWhAgMBAAGjazBpMAkGA1UdEwQCMAAw +CwYDVR0PBAQDAgXgME8GA1UdEQRIMEaCECoudGVzdC5nb29nbGUuZnKCGHdhdGVy +em9vaS50ZXN0Lmdvb2dsZS5iZYISKi50ZXN0LnlvdXR1YmUuY29thwTAqAEDMA0G +CSqGSIb3DQEBCwUAA4GBAJFXVifQNub1LUP4JlnX5lXNlo8FxZ2a12AFQs+bzoJ6 +hM044EDjqyxUqSbVePK0ni3w1fHQB5rY9yYC5f8G7aqqTY1QOhoUk8ZTSTRpnkTh +y4jjdvTZeLDVBlueZUTDRmy2feY5aZIU18vFDK08dTG0A87pppuv1LNIR3loveU8 +-----END CERTIFICATE----- diff --git a/packages/grpc-native-core/interop/async_delay_queue.js b/test/interop/async_delay_queue.js similarity index 100% rename from packages/grpc-native-core/interop/async_delay_queue.js rename to test/interop/async_delay_queue.js diff --git a/packages/grpc-native-core/interop/interop_client.js b/test/interop/interop_client.js similarity index 99% rename from packages/grpc-native-core/interop/interop_client.js rename to test/interop/interop_client.js index 8d1c1dd3..11a535d5 100644 --- a/packages/grpc-native-core/interop/interop_client.js +++ b/test/interop/interop_client.js @@ -20,10 +20,9 @@ var fs = require('fs'); var path = require('path'); -// TODO(murgatroid99): use multiple grpc implementations -var grpc = require('..'); +var grpc = require('../../packages/grpc-native-core'); var testProto = grpc.load({ - root: __dirname + '/../deps/grpc', + root: __dirname + '/../../packages/grpc-native-core/deps/grpc', file: 'src/proto/grpc/testing/test.proto'}).grpc.testing; var GoogleAuth = require('google-auth-library'); @@ -566,7 +565,7 @@ function runTest(address, host_override, test_case, tls, test_ca, done, extra) { if (tls) { var ca_path; if (test_ca) { - ca_path = path.join(__dirname, '../test/data/ca.pem'); + ca_path = path.join(__dirname, '../data/ca.pem'); var ca_data = fs.readFileSync(ca_path); creds = grpc.credentials.createSsl(ca_data); } else { diff --git a/packages/grpc-native-core/interop/interop_server.js b/test/interop/interop_server.js similarity index 96% rename from packages/grpc-native-core/interop/interop_server.js rename to test/interop/interop_server.js index 6e38aeb9..6682bbab 100644 --- a/packages/grpc-native-core/interop/interop_server.js +++ b/test/interop/interop_server.js @@ -22,10 +22,9 @@ var fs = require('fs'); var path = require('path'); var _ = require('lodash'); var AsyncDelayQueue = require('./async_delay_queue'); -// TODO(murgatroid99): use multiple grpc implementations -var grpc = require('..'); +var grpc = require('../../packages/grpc-native-core'); var testProto = grpc.load({ - root: __dirname + '/../deps/grpc', + root: __dirname + '/../../packages/grpc-native-core/deps/grpc', file: 'src/proto/grpc/testing/test.proto'}).grpc.testing; var ECHO_INITIAL_KEY = 'x-grpc-test-echo-initial'; @@ -202,8 +201,8 @@ function getServer(port, tls) { var options = {}; var server_creds; if (tls) { - var key_path = path.join(__dirname, '../test/data/server1.key'); - var pem_path = path.join(__dirname, '../test/data/server1.pem'); + var key_path = path.join(__dirname, '../data/server1.key'); + var pem_path = path.join(__dirname, '../data/server1.pem'); var key_data = fs.readFileSync(key_path); var pem_data = fs.readFileSync(pem_path);