projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d214057)
MDL-42447 performance: New var to add perf. info to redirections
authorDavid Monllao <davidm@moodle.com>
Thu, 14 Nov 2013 03:55:03 +0000 (11:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 15 Nov 2013 01:10:22 +0000 (09:10 +0800)
admin/tool/generator/testplan.template.jmx patch | blob | blame | history
lib/outputrenderers.php patch | blob | blame | history
lib/setup.php patch | blob | blame | history
lib/setuplib.php patch | blob | blame | history

diff --git a/admin/tool/generator/testplan.template.jmx b/admin/tool/generator/testplan.template.jmx
index 8d28bbc..ccd8cfb 100644 (file)
--- a/admin/tool/generator/testplan.template.jmx
+++ b/admin/tool/generator/testplan.template.jmx
@@ -752,7 +752,7 @@
             <stringProp name="HTTPSampler.contentEncoding"></stringProp>
             <stringProp name="HTTPSampler.path">${sitepath}/mod/forum/post.php</stringProp>
             <stringProp name="HTTPSampler.method">POST</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+            <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
             <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
             <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
             <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 39a6e05..fbaf76f 100644 (file)
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -893,6 +893,11 @@ class core_renderer extends renderer_base {
                 $performanceinfo = $perf['html'];
             }
         }
+
+        // We always want performance data when running a performance test, even if the user is redirected to another page.
+        if (MDL_PERF_TEST && strpos($footer, $this->unique_performance_info_token) === false) {
+            $footer = $this->unique_performance_info_token . $footer;
+        }
         $footer = str_replace($this->unique_performance_info_token, $performanceinfo, $footer);
 
         $footer = str_replace($this->unique_end_html_token, $this->page->requires->get_end_code(), $footer);
diff --git a/lib/setup.php b/lib/setup.php
index 40173a4..40ae817 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -217,6 +217,22 @@ if (!defined('PHPUNIT_TEST')) {
     define('PHPUNIT_TEST', false);
 }
 
+// Performance tests needs to always display performance info, even in redirections.
+if (!defined('MDL_PERF_TEST')) {
+    define('MDL_PERF_TEST', false);
+} else {
+    // We force the ones we need.
+    if (!defined('MDL_PERF')) {
+        define('MDL_PERF', true);
+    }
+    if (!defined('MDL_PERFDB')) {
+        define('MDL_PERFDB', true);
+    }
+    if (!defined('MDL_PERFTOFOOT')) {
+        define('MDL_PERFTOFOOT', true);
+    }
+}
+
 // When set to true MUC (Moodle caching) will be disabled as much as possible.
 // A special cache factory will be used to handle this situation and will use special "disabled" equivalents objects.
 // This ensure we don't attempt to read or create the config file, don't use stores, don't provide persistence or
diff --git a/lib/setuplib.php b/lib/setuplib.php
index 2e79285..abda23d 100644 (file)
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -1709,12 +1709,18 @@ width: 80%; -moz-border-radius: 20px; padding: 15px">
             $htmllang = '';
         }
 
+        $footer = '';
+        if (MDL_PERF_TEST) {
+            $perfinfo = get_performance_info();
+            $footer = '<footer>' . $perfinfo['html'] . '</footer>';
+        }
+
         return '<!DOCTYPE html>
 <html ' . $htmllang . '>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 '.$meta.'
 <title>' . $title . '</title>
-</head><body>' . $content . '</body></html>';
+</head><body>' . $content . $footer . '</body></html>';
     }
 }
Moodle official production repository