Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
0b55ff5
wip
lukesneeringer Jun 3, 2017
210ef3b
Wrote some docs; not much else.
lukesneeringer Jun 3, 2017
7cd6156
subscriber wip
lukesneeringer Jun 4, 2017
fc4ead3
WIP
Jun 5, 2017
890de3a
wip
Jun 5, 2017
12ace0e
wip
Jun 7, 2017
7305000
wip
lukesneeringer Jun 14, 2017
e5a27ae
Fix a couple minor lint issues.
Jun 27, 2017
d50a22e
Adapting a subscriber that will work.
Jun 27, 2017
14f200a
WIP
Jun 27, 2017
6a7e846
Implement lease management.
Jun 28, 2017
3bb130b
WIP
Jun 29, 2017
f97dc23
WIP
Jun 29, 2017
303436c
WIP
Jul 5, 2017
933d2f3
WIP
Jul 13, 2017
1df0ccf
WIP
Jul 13, 2017
acb4534
WIP
Jul 13, 2017
2fb2785
Update subscriber client config to be sane.
Jul 13, 2017
ef178e9
Start adding unit tests.
Jul 18, 2017
147ad18
Beginning work on unit tests.
Jul 19, 2017
c96367a
Merge branch 'pubsub-publisher' into pubsub-subscriber
Jul 20, 2017
9c701e3
Publisher tests complete.
Jul 25, 2017
de38b83
subscriber/client.py tests
Jul 26, 2017
faeaa8e
Consumer tests
Jul 26, 2017
d467719
Fix minor linting error.
Jul 26, 2017
c821d33
Histogram tests
Jul 26, 2017
ed750b2
Minor fix based on Max feedback.
Jul 26, 2017
216310c
starting on helper thread tests
Jul 26, 2017
a1fd287
Add tests for helper_threads.
Jul 27, 2017
32701e1
Almost done with unit tests.
Jul 27, 2017
34272ad
Full coverage.
lukesneeringer Jul 27, 2017
e1c7c84
Do not send policy across the concurrency boundary.
Jul 31, 2017
2b21f48
Shift flow control to the policy class.
Jul 31, 2017
7f4b91c
Move the request queue to using keyword arguments.
Jul 31, 2017
3852805
Can has flow control.
Aug 1, 2017
b697be2
Merge branch 'public-master' into pubsub-subscriber
Aug 1, 2017
81b37f4
Subscription fixes.
Aug 3, 2017
5784d4d
Change batch time, add gRPC time logging.
Aug 3, 2017
97d8431
Unit test fix.
Aug 3, 2017
cb7dc05
Minor RST fixes (thanks @jonparrott).
Aug 4, 2017
6994465
Remove the ignore in .flake8.
Aug 4, 2017
eae7e14
Set gRPC limit to 20MB + 1
Aug 9, 2017
6afcd2a
Suppress not-working grpc options.
lukesneeringer Aug 15, 2017
e8c0a78
Merge branch 'public-master' into pubsub-subscriber
Aug 18, 2017
41cfc08
Merge branch 'public-master' into pubsub-subscriber
Aug 21, 2017
dd096e1
Merge branch 'pubsub-publisher' into pubsub-subscriber
Aug 21, 2017
b76d363
Merge branch 'pubsub-publisher' into pubsub-subscriber
Aug 21, 2017
760bef6
Merge branch 'pubsub-publisher' into pubsub-subscriber
Aug 21, 2017
f196b5e
Fix some tests to match new futures.
Aug 21, 2017
5dbfd0a
Merge branch 'pubsub-publisher' into pubsub-subscriber
Aug 21, 2017
ee144aa
Move the future tests to match the code.
Aug 21, 2017
40ea1e6
Merge branch 'pubsub-publisher' into pubsub-subscriber
Aug 21, 2017
8cb8f98
Fix a publish failure test.
Aug 21, 2017
47678c3
Fix final test.
Aug 21, 2017
90ef40f
Sane max_workers default for 2.7 and 3.4
Aug 21, 2017
34c8273
Mock credentials appropriately.
Aug 21, 2017
831fe75
Remove fail_under from .coveragerc.
Aug 22, 2017
02fa81f
Make histogram and helper_threads private.
Aug 22, 2017
2458b55
Add a publishing system test.
Aug 22, 2017
aa56a9b
Merge branch 'pubsub-subscriber' of github.com:GoogleCloudPlatform/go…
Aug 22, 2017
17b6544
Subscription system test.
Aug 22, 2017
f469381
Merge branch 'pubsub-publisher' into pubsub-subscriber
Aug 22, 2017
a24c0a7
Update tests.
Aug 22, 2017
a054324
Make the wait test work on 2.7
Aug 22, 2017
3735da5
Discarding unused mocks.
Aug 22, 2017
ac9f182
Make _consumer a private module.
Aug 22, 2017
f272eca
Switch from recursion to while for maintain_leases.
Aug 22, 2017
e6bcbe7
Add exception logging in the callback.
Aug 22, 2017
b9115ca
Fix a long line. Whups.
Aug 23, 2017
6ae46cb
Accept an executor.
Aug 23, 2017
852438e
Fix a minor flake8 complaint.
Aug 23, 2017
13c2205
No longer need to use inf for exception timeout.
Aug 23, 2017
6a03f48
Fixes discussed in chat with @jonparrott.
Aug 23, 2017
f1dde8f
Pub/Sub Docs (#3849)
lukesneeringer Aug 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make the wait test work on 2.7
  • Loading branch information
Luke Sneeringer committed Aug 22, 2017
commit a054324ab669e029e4e363ed0e4da39cf36c78a2
6 changes: 2 additions & 4 deletions pubsub/tests/unit/pubsub_v1/publisher/test_futures.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,8 @@ def test_exception_with_error():

def test_exception_timeout():
future = Future()
with mock.patch.object(threading.Event, 'wait') as wait:
wait.return_value = False
with pytest.raises(exceptions.TimeoutError):
future.exception(timeout=10)
with pytest.raises(exceptions.TimeoutError):
future.exception(timeout=0.01)


def test_result_no_error():
Expand Down