(core) change version of redis used in Jenkins tests

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
gristlabs · Oct 3, 2024 · 6e391af · 6e391af
1 parent 05d8976
commit 6e391af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/test/nbrowser/AdminPanel.ts b/test/nbrowser/AdminPanel.ts
@@ -174,8 +174,10 @@ describe('AdminPanel', function() {
   it('should show version', async function() {
     await driver.get(`${server.getHost()}/admin`);
     await waitForAdminPanel();
-    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+\./);
+    await gu.waitToPass(async () => {
+      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+\./);
+    }, 3000);
   });
 
   it('should show sandbox', async function() {
@@ -185,7 +187,7 @@ describe('AdminPanel', function() {
     await gu.waitToPass(
       // unknown for grist-saas, unconfigured for grist-core.
       async () => assert.match(await driver.find('.test-admin-panel-item-value-sandboxing').getText(),
-                               /^((unknown)|(unconfigured))/),
+                               /^((Error: unknown)|(unconfigured))/),
       3000,
     );
     // It would be good to test other scenarios, but we are using

diff --git a/test/server/lib/GristJobs.ts b/test/server/lib/GristJobs.ts
@@ -45,8 +45,7 @@ describe('GristJobs', function() {
     }
   });
 
-  // FIXME: unskip this and the following test once Jenkins failures are resolved.
-  it.skip('can run delayed jobs', async function() {
+  it('can run delayed jobs', async function() {
     const jobs: GristJobs = new GristBullMQJobs();
     const q = jobs.queue();
     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 q = jobs.queue();
     try {
@@ -102,7 +101,8 @@ describe('GristJobs', function() {
 
   it('can pick up jobs again', async function() {
     // 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 q = jobs1.queue();
     try {