From 682729f8a17c9533ade0e830db4f16b0315e0ee6 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 7 Apr 2014 12:55:02 +0800 Subject: [PATCH] Do not start PHP Server for Behat on 2.7 --- lib/commands/behat.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/commands/behat.py b/lib/commands/behat.py index 21a0227..e8b083d 100644 --- a/lib/commands/behat.py +++ b/lib/commands/behat.py @@ -223,12 +223,14 @@ class BehatCommand(Command): if seleniumPath: seleniumCommand = '%s -jar %s' % (self.C.get('java'), seleniumPath) + olderThan27 = M.branch_compare(27, '<') + if args.run: logging.info('Preparing Behat testing') # Preparing PHP Server phpServer = None - if not M.get('behat_switchcompletely'): + if olderThan27 and not M.get('behat_switchcompletely'): logging.info('Starting standalone PHP server') kwargs = {} kwargs['cwd'] = M.get('path') @@ -266,7 +268,7 @@ class BehatCommand(Command): self.disable(M) else: - if M.branch_compare(27, '<'): + if olderThan27: logging.info('Launch PHP Server (or set $CFG->behat_switchcompletely to True):\n %s' % (phpCommand)) if seleniumCommand: logging.info('Launch Selenium (optional):\n %s' % (seleniumCommand)) -- 2.11.0