Merge branch 'MDL-68658_37' of https://github.com/stronk7/moodle into…

… MOODLE_37_STABLE
moodle · May 25, 2020 · bff7ea0 · bff7ea0
2 parents 591c98d + 267c26d
commit bff7ea0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/tests/rsslib_test.php b/lib/tests/rsslib_test.php
@@ -118,11 +118,15 @@ public function test_failproxy() {
         $oldproxy = $CFG->proxyhost;
         $CFG->proxyhost = 'xxxxxxxxxxxxxxx.moodle.org';
 
+        $oldproxybypass = $CFG->proxybypass; // Ensure we don't get locally served extests bypassing the proxy.
+        $CFG->proxybypass = '';
+
         $feed = new moodle_simplepie($this->getExternalTestFileUrl('/rsstest.xml'));
 
         $this->assertNotEmpty($feed->error());
         $this->assertEmpty($feed->get_title());
         $CFG->proxyhost = $oldproxy;
+        $CFG->proxybypass = $oldproxybypass;
     }
 
     /*