From a1593ab1c90a9433f6e9b4ae0eab8f3ccdaab40d Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 16 Aug 2009 18:39:45 +0000 Subject: - Patch #370454 by chx, Damien Tournoud: simplify page caching. --- modules/simpletest/tests/bootstrap.test | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'modules/simpletest/tests') diff --git a/modules/simpletest/tests/bootstrap.test b/modules/simpletest/tests/bootstrap.test index 14741e690..ed7faad9e 100644 --- a/modules/simpletest/tests/bootstrap.test +++ b/modules/simpletest/tests/bootstrap.test @@ -261,16 +261,14 @@ class HookBootExitTestCase extends DrupalWebTestCase { $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot called with normal cache.')); $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit called with normal cache.')); - // Test with aggressive cache. Boot and exit should not fire since the - // page is cached. - variable_set('cache', CACHE_AGGRESSIVE); + // Boot and exit should not fire since the page is cached. + variable_set('page_cache_invoke_hooks', FALSE); $this->assertTrue(cache_get(url('', array('absolute' => TRUE)), 'cache_page'), t('Page has been cached.')); $this->drupalGet(''); $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_boot'))->fetchField(), $calls, t('hook_boot not called with agressive cache and a cached page.')); $this->assertEqual(db_query('SELECT COUNT(*) FROM {watchdog} WHERE type = :type AND message = :message', array(':type' => 'system_test', ':message' => 'hook_exit'))->fetchField(), $calls, t('hook_exit not called with agressive cache and a cached page.')); - // Test with aggressive cache and page cache cleared. Boot and exit should - // be called. + // Test with page cache cleared, boot and exit should be called. $this->assertTrue(db_delete('cache_page')->execute(), t('Page cache cleared.')); $this->drupalGet(''); $calls++; -- cgit v1.2.3