Index: appengine/swarming/server/bot_code_test.py |
diff --git a/appengine/swarming/server/bot_code_test.py b/appengine/swarming/server/bot_code_test.py |
index 46218e519aea147fe0f27195af850d718d31d1c7..8f18c7acd9c21f5d5b9f6b4297a137207a2702e2 100755 |
--- a/appengine/swarming/server/bot_code_test.py |
+++ b/appengine/swarming/server/bot_code_test.py |
@@ -40,6 +40,24 @@ class BotManagementTest(test_case.TestCase): |
auth, 'get_current_identity', |
lambda: auth.Identity(auth.IDENTITY_USER, 'joe@localhost')) |
+ self._memcached={} |
+ self._read_from_memcached = False |
+ |
+ def mock_set_cached_bot_entry(content, version, desc, part=None): |
+ key = bot_code.cached_bot_key(version, desc, part) |
+ self._memcached[key] = content |
+ |
+ def mock_get_cached_bot_entry(version, desc, part=None): |
+ key = bot_code.cached_bot_key(version, desc, part) |
+ if key not in self._memcached: |
+ raise bot_code.MemcacheMissingException |
+ self._read_from_memcached = True |
+ return self._memcached[key] |
+ |
+ self.mock(bot_code, 'set_cached_bot_entry', mock_set_cached_bot_entry) |
+ self.mock(bot_code, 'get_cached_bot_entry', mock_get_cached_bot_entry) |
+ self.mock(bot_code, 'MAX_MEMCACHED_SIZE_BYTES', 100000) |
+ |
def test_get_bootstrap(self): |
def get_self_config_mock(path, revision=None, store_last_good=False): |
self.assertEqual('scripts/bootstrap.py', path) |
@@ -95,6 +113,12 @@ class BotManagementTest(test_case.TestCase): |
def test_get_swarming_bot_zip(self): |
zipped_code = bot_code.get_swarming_bot_zip('http://localhost') |
+ self.assertFalse(self._read_from_memcached) |
+ # Make sure that we read from memcached if we get it again |
+ zipped_code_copy = bot_code.get_swarming_bot_zip('http://localhost') |
+ self.assertTrue(self._read_from_memcached) |
+ # Why not assertEqual? Don't want to dump ~1MB of data if this fails. |
+ self.assertTrue(zipped_code == zipped_code_copy) |
# Ensure the zip is valid and all the expected files are present. |
with zipfile.ZipFile(StringIO.StringIO(zipped_code), 'r') as zip_file: |
for i in bot_archive.FILES: |
@@ -120,6 +144,7 @@ class BotManagementTest(test_case.TestCase): |
finally: |
file_path.rmtree(temp_dir) |
+ |
def test_bootstrap_token(self): |
tok = bot_code.generate_bootstrap_token() |
self.assertEqual( |