|  | @@ -75,8 +75,8 @@ static void drain_cq(grpc_completion_queue *cq) {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static void shutdown_server(grpc_end2end_test_fixture *f) {
 | 
	
		
			
				|  |  |    if (!f->server) return;
 | 
	
		
			
				|  |  | -  grpc_server_shutdown_and_notify(f->server, f->server_cq, tag(1000));
 | 
	
		
			
				|  |  | -  GPR_ASSERT(grpc_completion_queue_pluck(f->server_cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5)).type == GRPC_OP_COMPLETE);
 | 
	
		
			
				|  |  | +  grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000));
 | 
	
		
			
				|  |  | +  GPR_ASSERT(grpc_completion_queue_pluck(f->cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5)).type == GRPC_OP_COMPLETE);
 | 
	
		
			
				|  |  |    grpc_server_destroy(f->server);
 | 
	
		
			
				|  |  |    f->server = NULL;
 | 
	
		
			
				|  |  |  }
 | 
	
	
		
			
				|  | @@ -91,12 +91,9 @@ static void end_test(grpc_end2end_test_fixture *f) {
 | 
	
		
			
				|  |  |    shutdown_server(f);
 | 
	
		
			
				|  |  |    shutdown_client(f);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -  grpc_completion_queue_shutdown(f->server_cq);
 | 
	
		
			
				|  |  | -  drain_cq(f->server_cq);
 | 
	
		
			
				|  |  | -  grpc_completion_queue_destroy(f->server_cq);
 | 
	
		
			
				|  |  | -  grpc_completion_queue_shutdown(f->client_cq);
 | 
	
		
			
				|  |  | -  drain_cq(f->client_cq);
 | 
	
		
			
				|  |  | -  grpc_completion_queue_destroy(f->client_cq);
 | 
	
		
			
				|  |  | +  grpc_completion_queue_shutdown(f->cq);
 | 
	
		
			
				|  |  | +  drain_cq(f->cq);
 | 
	
		
			
				|  |  | +  grpc_completion_queue_destroy(f->cq);
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static void test_invoke_request_with_flags(
 | 
	
	
		
			
				|  | @@ -109,8 +106,7 @@ static void test_invoke_request_with_flags(
 | 
	
		
			
				|  |  |    gpr_timespec deadline = five_seconds_time();
 | 
	
		
			
				|  |  |    grpc_end2end_test_fixture f =
 | 
	
		
			
				|  |  |        begin_test(config, "test_invoke_request_with_flags", NULL, NULL);
 | 
	
		
			
				|  |  | -  cq_verifier *v_client = cq_verifier_create(f.client_cq);
 | 
	
		
			
				|  |  | -  cq_verifier *v_server = cq_verifier_create(f.server_cq);
 | 
	
		
			
				|  |  | +  cq_verifier *cqv = cq_verifier_create(f.cq);
 | 
	
		
			
				|  |  |    grpc_op ops[6];
 | 
	
		
			
				|  |  |    grpc_op *op;
 | 
	
		
			
				|  |  |    grpc_metadata_array initial_metadata_recv;
 | 
	
	
		
			
				|  | @@ -123,7 +119,7 @@ static void test_invoke_request_with_flags(
 | 
	
		
			
				|  |  |    size_t details_capacity = 0;
 | 
	
		
			
				|  |  |    grpc_call_error expectation;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -  c = grpc_channel_create_call(f.client, f.client_cq, "/foo",
 | 
	
		
			
				|  |  | +  c = grpc_channel_create_call(f.client, f.cq, "/foo",
 | 
	
		
			
				|  |  |                                 "foo.test.google.fr", deadline);
 | 
	
		
			
				|  |  |    GPR_ASSERT(c);
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -166,8 +162,7 @@ static void test_invoke_request_with_flags(
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    grpc_call_destroy(c);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -  cq_verifier_destroy(v_client);
 | 
	
		
			
				|  |  | -  cq_verifier_destroy(v_server);
 | 
	
		
			
				|  |  | +  cq_verifier_destroy(cqv);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    grpc_byte_buffer_destroy(request_payload);
 | 
	
		
			
				|  |  |    grpc_byte_buffer_destroy(request_payload_recv);
 |