Skip to content

Commit b43766b

Browse files
author
Guy Bedford
authored
Reenable acl tests, ci stability fixes (#1154)
1 parent b9765f6 commit b43766b

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

integration-tests/js-compute/fixtures/module-mode/tests.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"GET /acl": { "environments": ["compute"], "skip": true },
2+
"GET /acl": { "environments": ["compute"] },
33
"GET /backend/timeout": {
44
"environments": ["compute"],
55
"downstream_response": {

integration-tests/js-compute/setup.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@ zx.verbose = true;
154154
await setupConfigStores();
155155
await setupKVStore();
156156
await setupSecretStore();
157-
// disabled pending 503 fix
158-
// await setupAcl();
157+
await setupAcl();
159158
zx.verbose = false;
160159

161160
await zx`fastly service-version activate --service-id ${serviceId} --version latest --token $FASTLY_API_TOKEN`;

integration-tests/js-compute/teardown.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,9 @@ async function removeKVStore() {
8181

8282
let STORE_ID = existingListId(stores, KV_STORE_NAME);
8383
if (STORE_ID) {
84-
await fetch(`https://api.fastly.com/resources/stores/object/${STORE_ID}`, {
85-
method: 'DELETE',
86-
headers: {
87-
'Fastly-Key': FASTLY_API_TOKEN,
88-
},
89-
});
84+
await zx`fastly kv-store delete --store-id=${STORE_ID} --quiet --all -y --token $FASTLY_API_TOKEN`;
85+
} else {
86+
console.error(`Unable to find KV Store ${KV_STORE_NAME} to delete`);
9087
}
9188
}
9289

@@ -138,8 +135,7 @@ async function removeAcl() {
138135
await removeConfigStores();
139136
await removeKVStore();
140137
await removeSecretStore();
141-
// Disabled pending 503 fix
142-
// await removeAcl();
138+
await removeAcl();
143139

144140
console.log(
145141
`Tear down has finished! Took ${(Date.now() - startTime) / 1000} seconds to complete`,

0 commit comments

Comments
 (0)