From: Frederic Massart <fred@moodle.com>
Date: Fri, 24 Oct 2014 08:46:55 +0000 (+0800)
Subject: Behat does not override behat_wwwroot unless told to
X-Git-Tag: v1.4~21
X-Git-Url: https://git.cameron1729.xyz/?a=commitdiff_plain;h=2949c7cd8354c15b00d589b685b714293c7cdaa8;p=mdk.git

Behat does not override behat_wwwroot unless told to
---

diff --git a/mdk/moodle.py b/mdk/moodle.py
index 64cf6c3..4341b6d 100644
--- a/mdk/moodle.py
+++ b/mdk/moodle.py
@@ -361,7 +361,11 @@ class Moodle(object):
             if C.get('path') != '' and C.get('path') != None:
                 wwwroot = wwwroot + C.get('path') + '/'
             wwwroot = wwwroot + self.identifier
-            self.updateConfig('behat_wwwroot', wwwroot)
+            currentWwwroot = self.get('behat_wwwroot')
+            if not currentWwwroot or force:
+                self.updateConfig('behat_wwwroot', wwwroot)
+            elif currentWwwroot != wwwroot:
+                logging.warning('Behat wwwroot not changed, already set to \'%s\', expected \'%s\'.' % (currentWwwroot, wwwroot))
 
         # Force a cache purge
         self.purge()