diff options
| author | Ludwig Hähne <lhaehne@gmail.com> | 2021-10-15 15:28:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 06:28:10 -0700 |
| commit | 79d98d23cd589556b0dc51a7d10ea338e90a944e (patch) | |
| tree | 182a76f4aabcb727e96643459eb527a32a57bd03 /pymemcache/test | |
| parent | 25e38dfbf488d969b42af7a3299e33044e7a8730 (diff) | |
| download | pymemcache-79d98d23cd589556b0dc51a7d10ea338e90a944e.tar.gz | |
Return default from hash client when using positional argument (#354)
When using HashClient with ignore_exc, get would always return
None if no server is available and the default is passed as a
positional argument. The other clients return the default
value in this case. An earlier fix only had the desired effect when
passing default as a keyword argument.
For example, Django passes the default as a positional argument.
Return the default value so HashClient behaves like the other
clients.
Diffstat (limited to 'pymemcache/test')
| -rw-r--r-- | pymemcache/test/test_client_hash.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pymemcache/test/test_client_hash.py b/pymemcache/test/test_client_hash.py index 9ce48aa..f747845 100644 --- a/pymemcache/test/test_client_hash.py +++ b/pymemcache/test/test_client_hash.py @@ -262,6 +262,19 @@ class TestHashClient(ClientTestMixin, unittest.TestCase): result = client.set('foo', 'bar') assert result is False + def test_no_servers_left_return_positional_default(self): + from pymemcache.client.hash import HashClient + client = HashClient( + [], use_pooling=True, + ignore_exc=True, + timeout=1, connect_timeout=1 + ) + + # Ensure compatibility with clients that pass the default as a + # positional argument + result = client.get('foo', 'default') + assert result == 'default' + def test_no_servers_left_with_set_many(self): from pymemcache.client.hash import HashClient client = HashClient( @@ -381,7 +394,7 @@ class TestHashClient(ClientTestMixin, unittest.TestCase): # Client gets removed because of socket timeout assert ("127.0.0.1", 11211) in client._dead_clients - test_client.get.side_effect = lambda *_: "Some value" + test_client.get.side_effect = lambda *_, **_kw: "Some value" # Client should be retried and brought back assert client.get(b"key") == "Some value" assert ("127.0.0.1", 11211) not in client._dead_clients @@ -400,7 +413,7 @@ class TestHashClient(ClientTestMixin, unittest.TestCase): with pytest.raises(socket.timeout): client.get(b"key", noreply=False) - test_client.get.side_effect = lambda *_: "Some value" + test_client.get.side_effect = lambda *_, **_kw: "Some value" assert client.get(b"key") == "Some value" assert client_patch.call_count == 1 |