Commit 423fa2b9 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4305 (Memory optimisation)

parent 08333562

_tests/cmstest/cms_test_case.php

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ class cms_test_case extends WebTestCase 
        if (php_function_allowed('set_time_limit')) {

            @set_time_limit(0);

        }



        // We need to be compatible with low memory limits

        ini_set('memory_limit', '32M');

        set_value('memory_limit', '32M');

    }



    public function tearDown()

_tests/tests/unit_tests/addon_references.php

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ class addon_references_test_set extends cms_test_case 
                    $addon = $matches[1][$i];

                    $this->assertTrue(addon_installed($addon), 'Could not find PHP-referenced addon, ' . $addon);

                }

                unset($_c);

            }

        }

    }
@@ -53,6 +54,7 @@ class addon_references_test_set extends cms_test_case 
                    $addon = $matches[1][$i];

                    $this->assertTrue(addon_installed($addon), 'Could not find template-referenced addon, ' . $addon);

                }

                unset($_c);

            }

        }

    }

_tests/tests/unit_tests/broken_includes.php

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ class broken_includes_test_set extends cms_test_case 
    {

        parent::setUp();



        disable_php_memory_limit();



        require_code('files');

        require_code('files2');

        $this->contents = get_directory_contents(get_file_base());

_tests/tests/unit_tests/css_and_js.php

+2 −2
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ class css_and_js_test_set extends cms_test_case 
{

    public function setUp()

    {

        parent::setUp();



        if (php_function_allowed('set_time_limit')) {

            @set_time_limit(0);

        }
@@ -43,8 +45,6 @@ class css_and_js_test_set extends cms_test_case 
        $WEBSTANDARDS_EXT_FILES = true;

        $WEBSTANDARDS_MANUAL = false;

        $MAIL_MODE = false;



        parent::setUp();

    }



    public function testJavaScript()

_tests/tests/unit_tests/sitemap.php

+5 −3
Original line number Diff line number Diff line
@@ -25,11 +25,15 @@ class sitemap_test_set extends cms_test_case 


    public function setUp()

    {

        parent::setUp();



        if ($GLOBALS['SITE_DB']->query_select_value('sitemap_cache', 'COUNT(*)') > 3000) {

            $this->assertTrue(false, 'Test will not work on databases with a huge sitemap');

            return;

        }



        disable_php_memory_limit();



        $this->establish_admin_session();



        require_code('sitemap');
@@ -47,8 +51,6 @@ class sitemap_test_set extends cms_test_case 


        $this->sitemap = retrieve_sitemap_node($page_link, $callback, $valid_node_types, $child_cutoff, $max_recurse_depth, $this->options, $zone, $this->meta_gather);

        $this->flattened = $this->flatten_sitemap($this->sitemap);



        parent::setUp();

    }



    public function flatten_sitemap($sitemap)
@@ -203,7 +205,7 @@ class sitemap_test_set extends cms_test_case 
                }



                list($zone, $page) = explode(':', $k);

                $test = _request_page($page, $zone);

                $test = __request_page($page, $zone);

                if ($test === false) {

                    continue;

                }