commit 63f31e8cd16b185fd735bd753afbc0375cd573aa
author ZhouyihaiDing <ddyihai@google.com> Mon Sep 18 11:02:55 2017 -0700
committer GitHub <noreply@github.com> Mon Sep 18 11:02:55 2017 -0700
tree ef57dd7ee04501c102be2525372d86403ff1fbbc
parent 3de4c55abe0307f3780be20e7cfe68dbaae3b169
parent e4260e5b445ba01d141e2df2b642a846c5675ffa

Merge pull request #12495 from ZhouyihaiDing/build_php

run_tests.py: embed openssl during building c-core before running build_php.sh

src/python/grpcio_testing/grpc_testing/__init__.py

diff --git a/src/python/grpcio_testing/grpc_testing/__init__.py b/src/python/grpcio_testing/grpc_testing/__init__.py
index 917e118..9942745 100644
--- a/src/python/grpcio_testing/grpc_testing/__init__.py
+++ b/src/python/grpcio_testing/grpc_testing/__init__.py
@@ -213,7 +213,7 @@
         raise NotImplementedError()
 
 
-class Channel(six.with_metaclass(abc.ABCMeta), grpc.Channel):
+class Channel(six.with_metaclass(abc.ABCMeta, grpc.Channel)):
     """A grpc.Channel double with which to test a system that invokes RPCs."""
 
     @abc.abstractmethod

tools/run_tests/python_utils/filter_pull_request_tests.py

diff --git a/tools/run_tests/python_utils/filter_pull_request_tests.py b/tools/run_tests/python_utils/filter_pull_request_tests.py
index 4ad9812..f99143f 100644
--- a/tools/run_tests/python_utils/filter_pull_request_tests.py
+++ b/tools/run_tests/python_utils/filter_pull_request_tests.py
@@ -86,7 +86,6 @@
   '^test/distrib/php/': [_PHP_TEST_SUITE],
   '^test/distrib/python/': [_PYTHON_TEST_SUITE],
   '^test/distrib/ruby/': [_RUBY_TEST_SUITE],
-  '^tools/internal_ci/': [],
   '^vsprojects/': [_WINDOWS_TEST_SUITE],
   'binding\.gyp$': [_NODE_TEST_SUITE],
   'composer\.json$': [_PHP_TEST_SUITE],