Skip to content

Commit 4cfeb1d

Browse files
committed
fix tests
1 parent 9d57d08 commit 4cfeb1d

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ cdef class SSLChannelCredentials(ChannelCredentials):
204204
cdef grpc_tls_certificate_provider* c_tls_certificate_provider
205205

206206
c_tls_credentials_options = grpc_tls_credentials_options_create()
207-
if self._pem_root_certificates is not None:
208-
c_pem_root_certificates = self._pem_root_certificates
209-
else:
207+
if self._pem_root_certificates is None:
210208
c_pem_root_certificates = NULL
209+
else:
210+
c_pem_root_certificates = self._pem_root_certificates
211211
if self._private_key or self._certificate_chain:
212212
c_tls_identity_pairs = grpc_tls_identity_pairs_create()
213213
if self._private_key:
@@ -223,6 +223,10 @@ cdef class SSLChannelCredentials(ChannelCredentials):
223223
c_tls_certificate_provider = grpc_tls_certificate_provider_static_data_create(c_pem_root_certificates, c_tls_identity_pairs)
224224
grpc_tls_credentials_options_set_certificate_provider(c_tls_credentials_options, c_tls_certificate_provider)
225225
grpc_tls_certificate_provider_release(c_tls_certificate_provider)
226+
if c_pem_root_certificates != NULL:
227+
grpc_tls_credentials_options_watch_root_certs(c_tls_credentials_options)
228+
if c_tls_identity_pairs != NULL:
229+
grpc_tls_credentials_options_watch_identity_key_cert_pairs(c_tls_credentials_options)
226230
with nogil:
227231
return grpc_tls_credentials_create(c_tls_credentials_options)
228232

src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -589,33 +589,39 @@ cdef extern from "grpc/credentials.h":
589589
# We don't care about the internals (and in fact don't know them)
590590
pass
591591

592-
grpc_tls_credentials_options *grpc_tls_credentials_options_create()
592+
grpc_tls_credentials_options *grpc_tls_credentials_options_create() nogil
593593

594594
ctypedef struct grpc_tls_certificate_provider:
595595
# We don't care about the internals (and in fact don't know them)
596596
pass
597597

598-
void grpc_tls_credentials_options_set_certificate_provider(grpc_tls_credentials_options* options, grpc_tls_certificate_provider* provider)
598+
void grpc_tls_credentials_options_set_certificate_provider(grpc_tls_credentials_options* options, grpc_tls_certificate_provider* provider) nogil
599599

600600
ctypedef struct grpc_tls_identity_pairs:
601601
# We don't care about the internals (and in fact don't know them)
602602
pass
603603

604-
grpc_tls_identity_pairs* grpc_tls_identity_pairs_create();
604+
grpc_tls_identity_pairs* grpc_tls_identity_pairs_create() nogil
605605

606606
void grpc_tls_identity_pairs_add_pair(grpc_tls_identity_pairs* pairs,
607607
const char* private_key,
608-
const char* cert_chain);
608+
const char* cert_chain) nogil
609609

610610
grpc_tls_certificate_provider* grpc_tls_certificate_provider_static_data_create(
611-
const char* root_certificate, grpc_tls_identity_pairs* pem_key_cert_pairs);
611+
const char* root_certificate, grpc_tls_identity_pairs* pem_key_cert_pairs) nogil
612612

613613
void grpc_tls_credentials_options_set_certificate_provider(
614614
grpc_tls_credentials_options* options,
615-
grpc_tls_certificate_provider* provider);
615+
grpc_tls_certificate_provider* provider) nogil
616+
617+
void grpc_tls_credentials_options_watch_root_certs(
618+
grpc_tls_credentials_options* options) nogil
619+
620+
void grpc_tls_credentials_options_watch_identity_key_cert_pairs(
621+
grpc_tls_credentials_options* options) nogil
616622

617623
void grpc_tls_certificate_provider_release(
618-
grpc_tls_certificate_provider* provider);
624+
grpc_tls_certificate_provider* provider) nogil
619625

620626
ctypedef struct grpc_channel_credentials:
621627
# We don't care about the internals (and in fact don't know them)

0 commit comments

Comments
 (0)