Skip to content

Fix touch(..., time=0) sending invalid command to memcache #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timgraham merged 1 commit into from
Nov 21, 2017
Merged

Fix touch(..., time=0) sending invalid command to memcache #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
* Fixed storing non-ASCII values on Python 2 and binary values on Python 3
(PR from Nicolas Noé) #135

* Fixed touch(..., time=0) command (PR from Nicolas Noé) #137

Fri, 27 May 2016 13:44:55 -0600 Sean Reifschneider <jafo@tummy.com>

* 1.58 release.
Expand Down
2 changes: 1 addition & 1 deletion memcache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ def _deletetouch(self, expected, cmd, key, time=0, noreply=False):
if not server:
return 0
self._statlog(cmd)
if time is not None and time != 0:
if time is not None:
headers = str(time)
else:
headers = None
Expand Down
7 changes: 7 additions & 0 deletions tests/test_memcache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ def test_delete(self):
self.assertEqual(result, True)
self.assertEqual(self.mc.get("long"), None)

@mock.patch.object(_Host, 'send_cmd')
@mock.patch.object(_Host, 'readline')
def test_touch(self, mock_readline, mock_send_cmd):
with captured_stderr():
self.mc.touch('key')
mock_send_cmd.assert_called_with(b'touch key 0')

def test_get_multi(self):
self.check_setget("gm_a_string", "some random string")
self.check_setget("gm_an_integer", 42)
Expand Down