[ticket/15055] Fix line break and disable sql server 2017 for now

SQL Server 2017 currently fails for unknown reasons and just results in
an overall longer build time. Therefore disabling it for now.

PHPBB3-15055
This commit is contained in:
Marc Alexander 2018-01-08 22:19:58 +01:00
parent daf668a969
commit 3c7f45c166
2 changed files with 16 additions and 12 deletions

View file

@ -7,18 +7,18 @@ services:
environment: environment:
matrix: matrix:
# - db: mssql
# db_version: sql2012sp1
# php: 7.0
# - db: mssql
# db_version: sql2014
# php: 7.0
# - db: mssql
# db_version: sql2016
# php: 7.0
- db: mssql - db: mssql
db_version: sql2017 db_version: sql2012sp1
php: 7.1 php: 7.0
- db: mssql
db_version: sql2014
php: 7.0
- db: mssql
db_version: sql2016
php: 7.0
# - db: mssql
# db_version: sql2017
# php: 7.1
# - db: mariadb # - db: mariadb
# php: 7.1 # php: 7.1
# - db: mysqli # - db: mysqli
@ -114,6 +114,10 @@ before_test:
# Install PhantomJS # Install PhantomJS
cinst -y phantomjs cinst -y phantomjs
Start-Process "phantomjs" "--webdriver=8910" | Out-Null Start-Process "phantomjs" "--webdriver=8910" | Out-Null
- ps: |
cd c:\projects\phpbb\phpBB
(Get-Content c:\projects\phpbb\phpBB\web.config).replace("<configuration>", "<configuration>`n`t<system.web>`n`t`t<customErrors mode=`"Off`"/>`n`t</system.web>") | Set-Content c:\projects\phpbb\phpBB\web.config
(Get-Content c:\projects\phpbb\phpBB\web.config).replace("`t</system.webServer>", "`t`t<httpErrors errorMode=`"Detailed`" />`n`t</system.webServer>") | Set-Content c:\projects\phpbb\phpBB\web.config
- cd c:\projects\phpbb\phpBB - cd c:\projects\phpbb\phpBB
- php ..\composer.phar install - php ..\composer.phar install
- choco install -y urlrewrite - choco install -y urlrewrite

View file

@ -918,7 +918,7 @@ class phpbb_functional_test_case extends phpbb_test_case
if ($status_code != self::$client->getResponse()->getStatus() && if ($status_code != self::$client->getResponse()->getStatus() &&
preg_match('/^5[0-9]{2}/', self::$client->getResponse()->getStatus())) preg_match('/^5[0-9]{2}/', self::$client->getResponse()->getStatus()))
{ {
self::fail('Encountered unexpected server error:\n' . self::$client->getResponse()->getContent()); self::fail("Encountered unexpected server error:\n" . self::$client->getResponse()->getContent());
} }
self::assertEquals($status_code, self::$client->getResponse()->getStatus(), 'HTTP status code does not match'); self::assertEquals($status_code, self::$client->getResponse()->getStatus(), 'HTTP status code does not match');
} }