From 90e1c42863d841f67c5d0d4628753728623f3c60 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 21 Feb 2013 17:10:23 +0800 Subject: [PATCH] PHPUnit does not exit if config already set --- lib/moodle.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/moodle.py b/lib/moodle.py index 28b9e3f..897ab00 100644 --- a/lib/moodle.py +++ b/lib/moodle.py @@ -221,19 +221,13 @@ class Moodle(object): # Set PHPUnit data root phpunit_dataroot = self.get('dataroot') + '_phpu' - if self.get('phpunit_dataroot') == None: - self.addConfig('phpunit_dataroot', phpunit_dataroot) - elif self.get('phpunit_dataroot') != phpunit_dataroot: - raise Exception('Excepted value for phpunit_dataroot is \'%s\'' % phpunit_dataroot) + self.updateConfig('phpunit_dataroot', phpunit_dataroot) if not os.path.isdir(phpunit_dataroot): os.mkdir(phpunit_dataroot, 0777) # Set PHPUnit prefix phpunit_prefix = 'phpu_' - if self.get('phpunit_prefix') == None: - self.addConfig('phpunit_prefix', phpunit_prefix) - elif self.get('phpunit_prefix') != phpunit_prefix: - raise Exception('Excepted value for phpunit_prefix is \'%s\'' % phpunit_prefix) + self.updateConfig('phpunit_prefix', phpunit_prefix) result = (None, None, None) exception = None -- 2.11.0