Commit Graph

562 Commits

Author SHA1 Message Date
Hongwei Wang ac133bdd39 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-10 18:26:49 -07:00
Nicolas Noble ad47334500 Merge pull request #2844 from donnadionne/interop_nrp
adding node, ruby, and php to cloud to prod interop tests.
2015-08-10 15:09:13 -07:00
yang-g ffc8a6b431 move auth property iterator declaration into auth_context.h 2015-08-10 12:26:39 -07:00
Hongwei Wang aafbad6c96 Update tests.json 2015-08-07 17:34:32 -07:00
Hongwei Wang ad5c897a94 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-07 17:17:22 -07:00
Donna Dionne c897798fb1 adding node, ruby, and php to cloud to prod interop tests. 2015-08-07 11:22:07 -07:00
Nicolas Noble c7989b6c9f Merge pull request #2788 from ctiller/kinetic-lopsided-poetry
Testing port server
2015-08-07 10:51:08 -07:00
Craig Tiller c85357e051 Reduce mac CI load 2015-08-07 07:33:04 -07:00
Hongwei Wang c8928ca202 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-06 17:58:35 -07:00
Nicolas "Pixel" Noble 63323e3c07 Re-enabling tests that got culled off. 2015-08-07 02:56:13 +02:00
Hongwei Wang ef91e8f0b4 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-06 17:41:27 -07:00
Craig Tiller 9a0c10efc6 Windows fix 2015-08-06 15:47:32 -07:00
Craig Tiller 6b9477e8dc Merge github.com:grpc/grpc into kinetic-lopsided-poetry 2015-08-06 15:12:53 -07:00
Nicolas Noble 2db17838e7 Merge pull request #2800 from ctiller/reduce-mac-load
Reduce mac load on Jenkins
2015-08-06 12:53:09 -07:00
Hongwei Wang a83d1b324a Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-06 12:52:18 -07:00
Yang Gao e5b0459299 Merge pull request #2750 from ctiller/propagate
Core-supported context propagation
2015-08-06 09:39:51 -07:00
Abhishek Kumar 98049242b7 Merge pull request #2781 from yang-g/stuboptions
Add StubOptions
2015-08-05 15:55:19 -07:00
Craig Tiller 0700d8b118 Merge github.com:grpc/grpc into kinetic-lopsided-poetry 2015-08-05 15:28:41 -07:00
Craig Tiller cf0e79638f Merge branch 'propagate' into reduce-mac-load 2015-08-05 12:54:51 -07:00
Hongwei Wang bc7405c320 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-05 12:46:17 -07:00
Craig Tiller 22de7b65c0 Merge github.com:grpc/grpc into propagate 2015-08-05 12:13:15 -07:00
Vijay Pai 4e407ba343 Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter
Connection backoff interop test client and server
2015-08-05 12:01:12 -07:00
Vijay Pai 8158c6c309 Merge pull request #2713 from ctiller/plucking-hell
Allow specific pollers to be woken
2015-08-05 11:29:31 -07:00
Hongwei Wang 4346e53be6 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-05 11:21:15 -07:00
yang-g 38ed056304 Merge remote-tracking branch 'upstream/master' into stuboptions 2015-08-05 09:27:39 -07:00
yang-g ebd7a59fd9 Merge remote-tracking branch 'upstream/master' into reconnect_branch_based_on_jitter 2015-08-05 09:26:42 -07:00
Craig Tiller a529eca947 Merge branch 'propagate' into reduce-mac-load 2015-08-05 08:11:02 -07:00
Craig Tiller 18541a1cee Merge github.com:grpc/grpc into propagate 2015-08-05 08:10:22 -07:00
Craig Tiller 9429b619d9 Fix typo 2015-08-05 08:06:37 -07:00
Craig Tiller d50993d49b Add linux, mac as test platforms, only run _with_poll tests on linux 2015-08-05 08:04:36 -07:00
Craig Tiller ef12559f0f Rework restart facility to be more portable 2015-08-05 07:41:35 -07:00
Craig Tiller 5afe5e31ac Merge github.com:grpc/grpc into kinetic-lopsided-poetry 2015-08-05 07:19:02 -07:00
Nicolas Noble b5dd0f163d Merge pull request #2346 from jboeuf/upgrade-openssl-1.0.2d
Upgrading to OpenSSL 1.0.2d
2015-08-04 14:49:13 -07:00
Craig Tiller 8d453c5968 Merge pull request #2757 from jtattermusch/runtest_polishing
Runtest polishing
2015-08-04 14:27:23 -07:00
Craig Tiller f53d9c8d0d Testing port server
run_tests.py will start a server (if it's not running, or if the running
port server mismatches the 'current' one) that serves ports to use for
tests. The server is left running after run_tests.py finishes, so that
in environments such as Mac and Windows where tests run unshielded from
each other, we don't start jumping on already used ports.
2015-08-04 14:19:43 -07:00
Jan Tattermusch 9d67d8deaf add HealthCheck tests to run_tests.py 2015-08-04 11:30:01 -07:00
Craig Tiller a9c643fc60 Merge github.com:grpc/grpc into plucking-hell 2015-08-04 08:23:32 -07:00
Craig Tiller 17effabe42 Add proxy tests to end2end suite
Currently the oauth2 variant of these tests is disabled. Will work with
@jboeuf to figure out how to turn them on.
2015-08-04 08:19:36 -07:00
yang-g 297a25b0cf Add StubOptions 2015-08-03 16:43:46 -07:00
Nicolas "Pixel" Noble 70787578f6 Adding a sanity check that the cached makefile variables aren't committed. 2015-08-04 00:24:19 +02:00
Hongwei Wang 72538b9103 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-08-03 12:29:18 -07:00
yang-g 43728840ca merge with head and resolve conflicts 2015-08-03 11:16:26 -07:00
Jan Tattermusch 725835abf9 polishing runtests 2015-08-01 21:02:58 -07:00
Craig Tiller 42ce225d50 Merge github.com:grpc/grpc into plucking-hell
Conflicts:
	Makefile
2015-08-01 16:21:18 -07:00
Yang Gao 7716c53a21 Merge pull request #2717 from ctiller/yeah-we-know-what-youre-talking-about
Make call_create with host=NULL provide a default host name
2015-07-31 21:34:38 -07:00
Hongwei Wang 1284552713 Merge branch 'master' of https://github.com/grpc/grpc into zookeeper 2015-07-31 15:22:13 -07:00
Hongwei Wang 8e04d4107e Add zookeeper end-to-end test 2015-07-31 15:12:51 -07:00
Masood Malekghassemi 2b84162bd4 Use py.test from run_tests.py
Also updates the version of grpcio_test. Now that grpcio and its tests
are in different project packages, the version numbers should be kept in
sync.
2015-07-31 14:13:11 -07:00
Nathaniel Manista 5f8d05bb9c Merge pull request #2698 from soltanmm/reorganize-python
Reorganize src/python.
2015-07-31 09:43:33 -07:00
Michael Lumish 5d405bd3ec Merge pull request #2663 from jcanizales/run-test-server-locally
Run test server locally
2015-07-31 08:39:10 -07:00