Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) change version of redis used in Jenkins tests

Browse Source 
Summary:
This upgrades redis in Jenkins tests to be compatible
with BullMQ.

Test Plan: reactivates skipped tests

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D4362
This commit is contained in:
Paul Fitzpatrick 2024-10-03 17:23:39 -04:00
parent 05d8976c5b
commit 6e391afa62
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/nbrowser/AdminPanel.ts
View File

@ -174,8 +174,10 @@ describe('AdminPanel', function() {
it('should show version', async function() { it('should show version', async function() {
await driver.get(`${server.getHost()}/admin`); await driver.get(`${server.getHost()}/admin`);
await waitForAdminPanel(); await waitForAdminPanel();
await gu.waitToPass(async () => {
assert.equal(await driver.find('.test-admin-panel-item-version').isDisplayed(), true); assert.equal(await driver.find('.test-admin-panel-item-version').isDisplayed(), true);
assert.match(await driver.find('.test-admin-panel-item-value-version').getText(), /^Version \d+\./); assert.match(await driver.find('.test-admin-panel-item-value-version').getText(), /^Version \d+\./);
}, 3000);
}); });
it('should show sandbox', async function() { it('should show sandbox', async function() {
@ -185,7 +187,7 @@ describe('AdminPanel', function() {
await gu.waitToPass( await gu.waitToPass(
// unknown for grist-saas, unconfigured for grist-core. // unknown for grist-saas, unconfigured for grist-core.
async () => assert.match(await driver.find('.test-admin-panel-item-value-sandboxing').getText(), async () => assert.match(await driver.find('.test-admin-panel-item-value-sandboxing').getText(),
/^((unknown)|(unconfigured))/), /^((Error: unknown)|(unconfigured))/),
3000, 3000,
); );
// It would be good to test other scenarios, but we are using // It would be good to test other scenarios, but we are using

8
test/server/lib/GristJobs.ts
View File

@ -45,8 +45,7 @@ describe('GristJobs', function() {
} }
}); });
// FIXME: unskip this and the following test once Jenkins failures are resolved. it('can run delayed jobs', async function() {
it.skip('can run delayed jobs', async function() {
const jobs: GristJobs = new GristBullMQJobs(); const jobs: GristJobs = new GristBullMQJobs();
const q = jobs.queue(); const q = jobs.queue();
try { try {
@ -73,7 +72,7 @@ describe('GristJobs', function() {
} }
}); });
it.skip('can run repeated jobs', async function() { it('can run repeated jobs', async function() {
const jobs: GristJobs = new GristBullMQJobs(); const jobs: GristJobs = new GristBullMQJobs();
const q = jobs.queue(); const q = jobs.queue();
try { try {
@ -102,7 +101,8 @@ describe('GristJobs', function() {
it('can pick up jobs again', async function() { it('can pick up jobs again', async function() {
// this test is only appropriate if we have an external queue. // this test is only appropriate if we have an external queue.
if (!process.env.REDIS_URL) { this.skip(); } if (!process.env.REDIS_URL &&
!process.env.TEST_REDIS_URL) { this.skip(); }
const jobs1: GristJobs = new GristBullMQJobs(); const jobs1: GristJobs = new GristBullMQJobs();
const q = jobs1.queue(); const q = jobs1.queue();
try { try {