Remove platform-specific assertion

pull/23203/head
Richard Belleville 5 years ago
parent 4aeab73f0a
commit c10cae4659
  1. 1
      src/core/lib/security/credentials/alts/alts_credentials.cc
  2. 2
      src/core/lib/security/credentials/alts/alts_credentials.h
  3. 9
      test/core/security/credentials_test.cc

@ -30,6 +30,7 @@
#include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
#include "src/core/lib/security/security_connector/alts/alts_security_connector.h"
#define GRPC_CREDENTIALS_TYPE_ALTS "Alts"
#define GRPC_ALTS_HANDSHAKER_SERVICE_URL "metadata.google.internal.:8080"
grpc_alts_credentials::grpc_alts_credentials(

@ -26,8 +26,6 @@
#include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
#include "src/core/lib/security/credentials/credentials.h"
#define GRPC_CREDENTIALS_TYPE_ALTS "Alts"
/* Main struct for grpc ALTS channel credential. */
class grpc_alts_credentials final : public grpc_channel_credentials {
public:

@ -37,7 +37,6 @@
#include "src/core/lib/gprpp/host_port.h"
#include "src/core/lib/http/httpcli.h"
#include "src/core/lib/iomgr/error.h"
#include "src/core/lib/security/credentials/alts/alts_credentials.h"
#include "src/core/lib/security/credentials/composite/composite_credentials.h"
#include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/security/credentials/google_default/google_default_credentials.h"
@ -1523,7 +1522,7 @@ static void test_no_google_default_creds(void) {
grpc_httpcli_set_override(nullptr, nullptr);
}
static void test_compute_engine_creds(void) {
static void test_compute_engine_channel_creds(void) {
set_gce_tenancy_checker_for_testing(test_gce_tenancy_checker);
g_test_gce_tenancy_checker_called = false;
g_test_is_on_gce = true;
@ -1535,10 +1534,6 @@ static void test_compute_engine_creds(void) {
GPR_ASSERT(
strcmp(creds->type(), GRPC_CHANNEL_CREDENTIALS_TYPE_GOOGLE_DEFAULT) == 0);
auto* alts_creds = creds->alts_creds();
GPR_ASSERT(alts_creds != nullptr);
GPR_ASSERT(strcmp(alts_creds->type(), GRPC_CREDENTIALS_TYPE_ALTS) == 0);
auto* ssl_creds = creds->ssl_creds();
GPR_ASSERT(ssl_creds != nullptr);
GPR_ASSERT(strcmp(ssl_creds->type(), GRPC_CHANNEL_CREDENTIALS_TYPE_SSL) == 0);
@ -1854,7 +1849,7 @@ int main(int argc, char** argv) {
test_google_default_creds_gce();
test_google_default_creds_non_gce();
test_no_google_default_creds();
test_compute_engine_creds();
test_compute_engine_channel_creds();
test_metadata_plugin_success();
test_metadata_plugin_failure();
test_get_well_known_google_credentials_file_path();

Loading…
Cancel
Save