fix: use new s3 instance for every test (#124)

Fix race condition in tests where repo keys hang around.
ipfs · Jul 30, 2021 · d3c0056 · d3c0056
1 parent 76686e6
commit d3c0056
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/test/browser.js b/test/browser.js
@@ -7,12 +7,6 @@ const { ShardingDatastore, shard: { NextToLast } } = require('datastore-core')
 const BlockstoreDatastoreAdapter = require('blockstore-datastore-adapter')
 const mockS3 = require('./fixtures/mock-s3')
 const S3 = require('aws-sdk').S3
-const s3Instance = new S3({
-  params: {
-    Bucket: 'test'
-  }
-})
-mockS3(s3Instance)
 const { createRepo } = require('./fixtures/repo')
 
 /**
@@ -75,6 +69,13 @@ const CONFIGURATIONS = [{
   name: 'with s3',
   cleanup: () => {},
   createBackends: (prefix) => {
+    const s3Instance = new S3({
+      params: {
+        Bucket: 'test'
+      }
+    })
+    mockS3(s3Instance)
+
     return {
       root: new DatastoreS3(prefix, {
         s3: s3Instance,

diff --git a/test/node.js b/test/node.js
@@ -10,12 +10,6 @@ const { ShardingDatastore, shard: { NextToLast } } = require('datastore-core')
 const BlockstoreDatastoreAdapter = require('blockstore-datastore-adapter')
 const mockS3 = require('./fixtures/mock-s3')
 const S3 = require('aws-sdk').S3
-const s3Instance = new S3({
-  params: {
-    Bucket: 'test'
-  }
-})
-mockS3(s3Instance)
 const { createRepo } = require('./fixtures/repo')
 
 function cleanup (dir) {
@@ -64,6 +58,13 @@ const CONFIGURATIONS = [{
   name: 'with s3',
   cleanup: () => {},
   createBackends: (prefix) => {
+    const s3Instance = new S3({
+      params: {
+        Bucket: 'test'
+      }
+    })
+    mockS3(s3Instance)
+
     return {
       root: new DatastoreS3(prefix, {
         s3: s3Instance,