CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-11 01:16:01 +12:00
Code Issues Projects Releases Wiki Activity

Poll for deployments instead of sleeping

Browse source
This commit is contained in:
Jake Barnby 2023-08-22 23:12:04 -04:00
parent b58c34a052
commit 20de675bae
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
2 changed files with 133 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
tests/e2e/Services/Functions/FunctionsCustomClientTest.php
View file

@ -115,8 +115,25 @@ class FunctionsCustomClientTest extends Scope
$this->assertEquals(202, $deployment['headers']['status-code']); $this->assertEquals(202, $deployment['headers']['status-code']);
// Wait for deployment to be built. // Poll until deployment is built
sleep(20); while (true) {
$deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
if (
$deployment['headers']['status-code'] >= 400
|| \in_array($deployment['body']['status'], ['ready', 'failed'])
) {
break;
}
\sleep(1);
}
$this->assertEquals('ready', $deployment['body']['status']);
$function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [ $function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
'content-type' => 'application/json', 'content-type' => 'application/json',
@ -229,10 +246,25 @@ class FunctionsCustomClientTest extends Scope
$deploymentId = $deployment['body']['$id'] ?? ''; $deploymentId = $deployment['body']['$id'] ?? '';
// Wait for deployment to be built. // Poll until deployment is built
sleep(20); while (true) {
$deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
$this->assertEquals(202, $deployment['headers']['status-code']); if (
$deployment['headers']['status-code'] >= 400
|| \in_array($deployment['body']['status'], ['ready', 'failed'])
) {
break;
}
\sleep(1);
}
$this->assertEquals('ready', $deployment['body']['status']);
$function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, [ $function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
'content-type' => 'application/json', 'content-type' => 'application/json',
@ -341,10 +373,25 @@ class FunctionsCustomClientTest extends Scope
$deploymentId = $deployment['body']['$id'] ?? ''; $deploymentId = $deployment['body']['$id'] ?? '';
// Wait for deployment to be built. // Poll until deployment is built
sleep(20); while (true) {
$deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
$this->assertEquals(202, $deployment['headers']['status-code']); if (
$deployment['headers']['status-code'] >= 400
|| \in_array($deployment['body']['status'], ['ready', 'failed'])
) {
break;
}
\sleep(1);
}
$this->assertEquals('ready', $deployment['body']['status']);
// Why do we have to do this? // Why do we have to do this?
$function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, [ $function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
@ -406,13 +453,10 @@ class FunctionsCustomClientTest extends Scope
'content-type' => 'application/json', 'content-type' => 'application/json',
'x-appwrite-project' => $projectId, 'x-appwrite-project' => $projectId,
], $this->getHeaders()), [ ], $this->getHeaders()), [
'data' => 'foobar', 'data' => 'foobar'
'async' => true
]); ]);
$this->assertEquals(202, $execution['headers']['status-code']); $this->assertEquals(200, $execution['headers']['status-code']);
sleep(20);
$base = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [ $base = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
'content-type' => 'application/json', 'content-type' => 'application/json',
@ -574,14 +618,31 @@ class FunctionsCustomClientTest extends Scope
$this->assertEquals(202, $deployment['headers']['status-code']); $this->assertEquals(202, $deployment['headers']['status-code']);
// Wait for deployment to be built. // Poll until deployment is built
sleep(20); while (true) {
$deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
if (
$deployment['headers']['status-code'] >= 400
|| \in_array($deployment['body']['status'], ['ready', 'failed'])
) {
break;
}
\sleep(1);
}
$this->assertEquals('ready', $deployment['body']['status']);
$function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, [ $function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
'content-type' => 'application/json', 'content-type' => 'application/json',
'x-appwrite-project' => $projectId, 'x-appwrite-project' => $projectId,
'x-appwrite-key' => $apikey, 'x-appwrite-key' => $apikey,
], []); ]);
$this->assertEquals(200, $function['headers']['status-code']); $this->assertEquals(200, $function['headers']['status-code']);

68
tests/e2e/Services/Functions/FunctionsCustomServerTest.php
View file

@ -377,8 +377,26 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(true, (new DatetimeValidator())->isValid($deployment['body']['$createdAt'])); $this->assertEquals(true, (new DatetimeValidator())->isValid($deployment['body']['$createdAt']));
$this->assertEquals('index.php', $deployment['body']['entrypoint']); $this->assertEquals('index.php', $deployment['body']['entrypoint']);
// Wait for deployment to build. // Poll until deployment is built
sleep(60); while (true) {
$deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
if (
$deployment['headers']['status-code'] >= 400
|| \in_array($deployment['body']['status'], ['ready', 'failed'])
) {
break;
}
\sleep(1);
}
$this->assertEquals(200, $deployment['headers']['status-code']);
$this->assertEquals('ready', $deployment['body']['status']);
return array_merge($data, ['deploymentId' => $deploymentId]); return array_merge($data, ['deploymentId' => $deploymentId]);
} }
@ -627,12 +645,6 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals('', $execution['body']['logs']); $this->assertEquals('', $execution['body']['logs']);
$this->assertLessThan(10, $execution['body']['duration']); $this->assertLessThan(10, $execution['body']['duration']);
/**
* Test for FAILURE
*/
sleep(20);
return array_merge($data, ['executionId' => $executionId]); return array_merge($data, ['executionId' => $executionId]);
} }
@ -872,8 +884,25 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(202, $deployment['headers']['status-code']); $this->assertEquals(202, $deployment['headers']['status-code']);
// Allow build step to run // Poll until deployment is built
sleep(40); while (true) {
$deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
if (
$deployment['headers']['status-code'] >= 400
|| \in_array($deployment['body']['status'], ['ready', 'failed'])
) {
break;
}
\sleep(1);
}
$this->assertEquals('ready', $deployment['body']['status']);
$execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([ $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
'content-type' => 'application/json', 'content-type' => 'application/json',
@ -986,8 +1015,23 @@ class FunctionsCustomServerTest extends Scope
$deploymentId = $deployment['body']['$id'] ?? ''; $deploymentId = $deployment['body']['$id'] ?? '';
$this->assertEquals(202, $deployment['headers']['status-code']); $this->assertEquals(202, $deployment['headers']['status-code']);
// Allow build step to run // Poll until deployment is built
sleep(60); while (true) {
$deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
]);
if (
$deployment['headers']['status-code'] >= 400
|| \in_array($deployment['body']['status'], ['ready', 'failed'])
) {
break;
}
\sleep(1);
}
$deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([ $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
'content-type' => 'application/json', 'content-type' => 'application/json',