Tweaks automated tests to reduce spurious failures in CI

Author: DougReeder

spec/account.spec.js

@@ -111,7 +111,7 @@ module.exports.shouldCreateDeleteAndReadAccounts = function () {
     });
 
     it('deletes a user', async function () {
-      this.timeout(15_000);
+      this.timeout(60_000);
       const params = { username: this.usernameAccount2, contactURL: '[email protected]' };
       this.user2 = await this.accountMgr.createUser(params, new Set());
 

spec/armadietto/oauth_spec.js

@@ -35,9 +35,9 @@ const store = {
 };
 
 const sandbox = chai.spy.sandbox();
-describe('OAuth', async () => {
+describe('OAuth', async function () {
   before((done) => {
-    (async () => {
+    (async function () {
       this._server = new Armadietto({
         store,
         http: { port: 4567 },
@@ -49,13 +49,13 @@ describe('OAuth', async () => {
   });
 
   after((done) => {
-    (async () => {
+    (async function () {
       await this._server.stop();
       done();
     })();
   });
 
-  beforeEach(() => {
+  beforeEach(function () {
     this.auth_params = {
       username: 'zebcoe',
       password: 'locog',
@@ -69,93 +69,94 @@ describe('OAuth', async () => {
     sandbox.on(store, ['authorize', 'authenticate']);
   });
 
-  afterEach(() => {
+  afterEach(function () {
     sandbox.restore();
   });
 
-  describe('with invalid client input', () => {
-    beforeEach(() => {
-      delete this.auth_params.state;
+  describe('with invalid client input', function () {
+    beforeEach(function () {
+      delete this.auth_params?.state;
+      this.timeout(60_000);
     });
 
-    it('returns an error if redirect_uri is missing', async () => {
+    it('returns an error if redirect_uri is missing', async function () {
       delete this.auth_params.redirect_uri;
       const res = await get('/oauth/me', this.auth_params);
       expect(res).to.have.status(400);
       expect(res.text).to.have.been.equal('error=invalid_request&error_description=Required%20parameter%20%22redirect_uri%22%20is%20missing');
     });
 
-    it('returns an error if client_id is missing', async () => {
+    it('returns an error if client_id is missing', async function () {
       delete this.auth_params.client_id;
       const res = await get('/oauth/me', this.auth_params);
       expect(res).to.redirectTo('http://example.com/cb#error=invalid_request&error_description=Required%20parameter%20%22client_id%22%20is%20missing');
     });
 
-    it('returns an error if response_type is missing', async () => {
+    it('returns an error if response_type is missing', async function () {
       delete this.auth_params.response_type;
       const res = await get('/oauth/me', this.auth_params);
       expect(res).to.redirectTo('http://example.com/cb#error=invalid_request&error_description=Required%20parameter%20%22response_type%22%20is%20missing');
     });
 
-    it('returns an error if response_type is not recognized', async () => {
+    it('returns an error if response_type is not recognized', async function () {
       this.auth_params.response_type = 'wrong';
       const res = await get('/oauth/me', this.auth_params);
       expect(res).to.redirectTo('http://example.com/cb#error=unsupported_response_type&error_description=Response%20type%20%22wrong%22%20is%20not%20supported');
     });
 
-    it('returns an error if scope is missing', async () => {
+    it('returns an error if scope is missing', async function () {
       delete this.auth_params.scope;
       const res = await get('/oauth/me', this.auth_params);
       expect(res).to.redirectTo('http://example.com/cb#error=invalid_scope&error_description=Parameter%20%22scope%22%20is%20invalid');
     });
 
-    it('returns an error if username is missing', async () => {
+    it('returns an error if username is missing', async function () {
       delete this.auth_params.username;
       const res = await post('/oauth', this.auth_params);
       expect(res).to.have.status(400);
     });
   });
 
-  describe('with valid login credentials', async () => {
-    describe('without explicit read/write permissions', async () => {
-      it('authorizes the client to read and write', async () => {
+  describe('with valid login credentials', async function () {
+    describe('without explicit read/write permissions', async function () {
+      it('authorizes the client to read and write', async function () {
         await post('/oauth', this.auth_params);
         expect(store.authorize).to.be.called.with('the_client_id', 'zebcoe', { the_scope: ['r', 'w'] });
       });
     });
 
-    describe('with explicit read permission', async () => {
-      it('authorizes the client to read', async () => {
+    describe('with explicit read permission', async function () {
+      it('authorizes the client to read', async function () {
         this.auth_params.scope = 'the_scope:r';
         await post('/oauth', this.auth_params);
         expect(store.authorize).to.be.called.with('the_client_id', 'zebcoe', { the_scope: ['r'] });
       });
     });
 
-    describe('with explicit read/write permission', async () => {
-      it('authorizes the client to read and write', async () => {
+    describe('with explicit read/write permission', async function () {
+      it('authorizes the client to read and write', async function () {
         this.auth_params.scope = 'the_scope:rw';
         await post('/oauth', this.auth_params);
         expect(store.authorize).to.be.called.with('the_client_id', 'zebcoe', { the_scope: ['r', 'w'] });
       });
     });
 
-    it('redirects with an access token', async () => {
+    it('redirects with an access token', async function () {
       const res = await post('/oauth', this.auth_params);
       expect(res).to.redirectTo('http://example.com/cb#access_token=a_token&token_type=bearer&state=the_state');
     });
   });
 
-  describe('with invalid login credentials', async () => {
-    it('does not authorize the client', async () => {
+  describe('with invalid login credentials', async function () {
+    it('does not authorize the client', async function () {
       store.authenticate = (params) => {
         throw new Error();
       };
       await post('/oauth', this.auth_params);
       expect(store.authorize).to.be.called.exactly(0);
     });
 
-    it('returns a 401 response with the login form', async () => {
+    it('returns a 401 response with the login form', async function () {
       store.authenticate = (params) => {
         throw new Error();
       };

spec/modular/m_oauth.spec.js

@@ -120,6 +120,7 @@ describe('OAuth (modular)', function () {
         scope: 'the_scope'
         // no state
       };
+      this.timeout(60_000);
     });
 
     it('returns an error if redirect_uri is missing', async function () {

spec/oauth.spec.js

@@ -21,6 +21,7 @@ exports.shouldImplementOAuth = function () {
         scope: 'the_scope'
         // no state
       };
+      this.timeout(60_000);
     });
 
     it('returns an error if redirect_uri is missing', async function () {

spec/store_handler.spec.js

@@ -20,9 +20,9 @@ const LIST_DIR_NAME = 'stuff-' + Math.round(Math.random() * Number.MAX_SAFE_INTE
 
 module.exports.shouldStoreStreams = function () {
   before(async function () {
-    this.timeout(15_000);
+    this.timeout(60_000);
 
-    const usernameStore = 'automated-test-' + Math.round(Math.random() * Number.MAX_SAFE_INTEGER);
+    const usernameStore = ('automated-test-' + Math.round(Math.random() * Number.MAX_SAFE_INTEGER)).slice(0, 29);
     const user = await this.store.createUser({ username: usernameStore, contactURL: '[email protected]' }, new Set());
     this.userIdStore = user.username;
   });
@@ -33,7 +33,7 @@ module.exports.shouldStoreStreams = function () {
   });
 
   describe('upsertAdminBlob & readAdminBlob', function () {
-    this.timeout(30_000);
+    this.timeout(60_000);
 
     it('should store and retrieve blobs', async function () {
       const relativePath = path.join(ADMIN_INVITE_DIR_NAME, 'mailto%3Atestname%40testhost.org.yaml');
@@ -49,7 +49,7 @@ module.exports.shouldStoreStreams = function () {
   });
 
   describe('metadataAdminBlob', function () {
-    this.timeout(30_000);
+    this.timeout(60_000);
 
     it('should retrieve metadata', async function () {
       const relativePath = path.join(ADMIN_INVITE_DIR_NAME, 'mailto%3Asomename%40somehost.edu.yaml');
@@ -69,7 +69,7 @@ module.exports.shouldStoreStreams = function () {
   });
 
   describe('deleteAdminBlob', function () {
-    this.timeout(30_000);
+    this.timeout(60_000);
 
     it('should delete blob', async function () {
       const relativePath = path.join(ADMIN_INVITE_DIR_NAME, 'mailto%3Asomename%40somehost.edu.yaml');
@@ -122,7 +122,7 @@ module.exports.shouldStoreStreams = function () {
   });
 
   describe('GET', function () {
-    this.timeout(30_000);
+    this.timeout(60_000);
 
     describe('for files', function () {
       describe('unversioned', function () {
@@ -383,11 +383,11 @@ module.exports.shouldStoreStreams = function () {
         expect(folder.items['yellow-red'].ETag).to.equal(stripQuotes(putRes1.get('ETag')));
         expect(folder.items['yellow-red']['Content-Type']).to.equal('text/csv');
         expect(folder.items['yellow-red']['Content-Length']).to.equal(content1.length);
-        expect(Date.now() - new Date(folder.items['yellow-red']['Last-Modified'])).to.be.lessThan(20_000);
+        expect(Date.now() - new Date(folder.items['yellow-red']['Last-Modified'])).to.be.lessThan(60_000);
         expect(folder.items['blue-green'].ETag).to.equal(stripQuotes(putRes2.get('ETag')));
         expect(folder.items['blue-green']['Content-Type']).to.equal('text/n3');
         expect(folder.items['blue-green']['Content-Length']).to.equal(content2.length);
-        expect(Date.now() - new Date(folder.items['blue-green']['Last-Modified'])).to.be.lessThan(15_000);
+        expect(Date.now() - new Date(folder.items['blue-green']['Last-Modified'])).to.be.lessThan(60_000);
         expect(folder.items['subfolder/'].ETag).to.match(/^.{6,128}$/);
 
         const [_subfolderReq, subfolderRes] = await callMiddleware(this.handler, {
@@ -484,7 +484,7 @@ module.exports.shouldStoreStreams = function () {
   });
 
   describe('PUT', function () {
-    this.timeout(30_000);
+    this.timeout(60_000);
 
     describe('unversioned', function () {
       it('does not create a file for a bad user name', async function () {
@@ -1334,7 +1334,7 @@ module.exports.shouldStoreStreams = function () {
   });
 
   describe('DELETE', function () {
-    this.timeout(30_000);
+    this.timeout(60_000);
 
     describe('unversioned', function () {
       it('should return Not Found for nonexistent user', async function () {

spec/store_handlers/S3_store_handler.spec.js

@@ -11,9 +11,9 @@ const { shouldCreateDeleteAndReadAccounts } = require('../account.spec');
 
 describe('S3 store router', function () {
   before(function () {
-    this.timeout(15_000);
+    this.timeout(60_000);
     configureLogger({ stdout: ['notice'], log_dir: './test-log', log_files: ['debug'] });
-    this.USER_NAME_SUFFIX = '-java.extraordinary.org';
+    this.USER_NAME_SUFFIX = '-java.extraordinary.test';
     // If the environment variables aren't set, tests are run using a shared public account on play.min.io
     console.info(`creating s3storeHandler with endpoint “${process.env.S3_ENDPOINT}”, accessKey “${process.env.S3_ACCESS_KEY}”, & region “${process.env.S3_REGION}”`);
     this.handler = s3storeHandler({ endPoint: process.env.S3_ENDPOINT, accessKey: process.env.S3_ACCESS_KEY, secretKey: process.env.S3_SECRET_KEY, region: process.env.S3_REGION || 'us-east-1', userNameSuffix: this.USER_NAME_SUFFIX });