From 2439d0a8d7e48750d7b73a0e8da9a3571f6617cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Szafra=C5=84ski?= Date: Tue, 12 Feb 2019 12:51:29 +0100 Subject: Add support for default value in get --- tests/test_memcache.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests') diff --git a/tests/test_memcache.py b/tests/test_memcache.py index 40b6524..4cdf7a6 100644 --- a/tests/test_memcache.py +++ b/tests/test_memcache.py @@ -51,6 +51,20 @@ class TestMemcache(unittest.TestCase): self.assertEqual(result, True) self.assertEqual(self.mc.get("long"), None) + def test_default(self): + key = "default" + default = object() + result = self.mc.get(key, default=default) + self.assertEqual(result, default) + + self.mc.set("default", None) + result = self.mc.get(key, default=default) + self.assertIsNone(result) + + self.mc.set("default", 123) + result = self.mc.get(key, default=default) + self.assertEqual(result, 123) + @mock.patch.object(_Host, 'send_cmd') @mock.patch.object(_Host, 'readline') def test_touch(self, mock_readline, mock_send_cmd): -- cgit v1.2.1 From 44c5317773acd0230c2cb9f86e4e6eb6db4e3cb7 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Sun, 15 Dec 2019 17:33:24 -0800 Subject: test_memcache.py: try import unittest.mock Rather than always require the separate mock module, try to use unittest.mock if it is available Signed-off-by: Tim Orling --- tests/test_memcache.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_memcache.py b/tests/test_memcache.py index 40b6524..621ac5c 100644 --- a/tests/test_memcache.py +++ b/tests/test_memcache.py @@ -4,7 +4,10 @@ from __future__ import print_function import unittest import zlib -import mock +try: + import unittest.mock as mock +except ImportError: + import mock from memcache import Client, _Host, SERVER_MAX_KEY_LENGTH, SERVER_MAX_VALUE_LENGTH # noqa: H301 from .utils import captured_stderr -- cgit v1.2.1 From ab668ed17887c956af3e2af89555e31d190ab63d Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Sun, 16 Apr 2023 10:06:56 -0600 Subject: Removing "time" from delete and making expiry mandatory in touch. Port of erankor's PR #30 to the latest code. In that PR, the "time" argument to delete() is removed because it is not supported by the protocol: https://github.com/memcached/memcached/blob/master/doc/protocol.txt#L330 And touch requires the expiry parameter due to protocol: https://github.com/memcached/memcached/blob/master/doc/protocol.txt#L399 --- tests/test_memcache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_memcache.py b/tests/test_memcache.py index d0f4857..e87dd09 100644 --- a/tests/test_memcache.py +++ b/tests/test_memcache.py @@ -245,7 +245,7 @@ class TestMemcache(unittest.TestCase): self.mc.touch('key') self.assertEqual( output.getvalue(), - "MemCached: touch expected %s, got: 'SET'\n" % b'TOUCHED' + "MemCached: touch expected %s, got: 'SET'\n" % 'TOUCHED' ) -- cgit v1.2.1 From 12f9bf1fb70082e4dc704cfb037e96335bddaa5f Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Sun, 16 Apr 2023 10:27:24 -0600 Subject: Adding test for quit_all --- tests/test_memcache.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests') diff --git a/tests/test_memcache.py b/tests/test_memcache.py index e87dd09..3593e03 100644 --- a/tests/test_memcache.py +++ b/tests/test_memcache.py @@ -48,6 +48,9 @@ class TestMemcache(unittest.TestCase): self.check_setget("an_integer", 42) self.check_setget("an_integer_2", 42, noreply=True) + def test_quit_all(self): + self.mc.quit_all() + def test_delete(self): self.check_setget("long", int(1 << 30)) result = self.mc.delete("long") -- cgit v1.2.1