Skip to content

Commit 9065f93

Browse files
committed
Fix sqlConnectTest under sqlite.
1 parent e18c35f commit 9065f93

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

.circleci/config.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,22 +149,22 @@ workflows:
149149
triggers:
150150
- schedule:
151151
# Uses UTC timezone.
152-
cron: "16 20 * * *"
152+
cron: "17 21 * * *"
153153
filters:
154154
branches:
155155
only:
156156
- master
157157
jobs:
158158
- test_72_highest
159159
- test_71_sqlite
160-
- test_71_postgres:
161-
pre-steps:
162-
- run:
163-
name: install dockerize
164-
command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
165-
environment:
166-
DOCKERIZE_VERSION: v0.3.0
167-
- run:
168-
name: Wait for db
169-
command: dockerize -wait tcp://localhost:5432 -timeout 1m
160+
- test_71_postgres
161+
# pre-steps:
162+
# - run:
163+
# name: install dockerize
164+
# command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && tar -C . -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
165+
# environment:
166+
# DOCKERIZE_VERSION: v0.3.0
167+
# - run:
168+
# name: Wait for db
169+
# command: ./dockerize -wait tcp://localhost:5432 -timeout 1m
170170

tests/functional/SqlConnectCreateTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function testSqlConnect()
3535
}
3636

3737
// Issue a query and check the result to verify the connection.
38-
$this->execute($connectionString . ' ' . $shell_options . ' "SELECT uid FROM users where uid = 1;"');
38+
$this->execute($connectionString . ' ' . $shell_options . ' "SELECT uid FROM users where uid = 1;"', self::EXIT_SUCCESS, $this->webroot());
3939
$output = $this->getOutput();
4040
$this->assertContains('1', $output);
4141

tests/unish/UnishTestCase.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,8 @@ protected function installSut($uri = self::INTEGRATION_TEST_ENV, $optionsFromTes
669669
'quiet' => true,
670670
];
671671
$process = new SiteProcess($sutAlias, [self::getDrush(), 'site:install', 'testing', 'install_configure_form.enable_update_status_emails=NULL'], $options);
672+
// Set long timeout because Xdebug slows everything.
673+
$process->setTimeout(0);
672674
$process->run();
673675
$this->assertTrue($process->isSuccessful(), 'Could not install SUT. Options: ' . var_export($optionsFromTest, true) . "\nStdout:\n" . $process->getOutput() . "\n\nStderr:\n" . $process->getErrorOutput());
674676

0 commit comments

Comments
 (0)