Fixed test setup.

aerospike · Dec 19, 2024 · b795990 · b795990
1 parent a361f08
commit b795990
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/test/test_helper.js b/test/test_helper.js
@@ -221,6 +221,14 @@ exports.skipUnlessVersion = function (versionRange, ctx) {
   skipUnless(ctx, () => this.cluster.isVersionInRange(versionRange), `cluster version does not meet requirements: "${versionRange}"`)
 }
 
+exports.skipUnlessVersionAndEnterprise = function (versionRange, ctx) {
+  skipUnless(ctx, () => {this.cluster.isVersionInRange(versionRange) && this.cluster.isEnterprise() }, `cluster version does not meet requirements: "${versionRange} and/or requires enterprise"`)
+}
+
+exports.skipUnlessVersionAndCommunity = function (versionRange, ctx) {
+  skipUnless(ctx, () => {this.cluster.isVersionInRange(versionRange) && (!this.cluster.isEnterprise()) }, `cluster version does not meet requirements: "${versionRange} and/or requires enterprise"`)
+}
+
 exports.skipUnlessSupportsTtl = function (ctx) {
   skipUnless(ctx, () => this.cluster.supportsTtl(), 'test namespace does not support record TTLs')
 }

diff --git a/ts-test/tests/mrt_api.ts b/ts-test/tests/mrt_api.ts
@@ -31,8 +31,7 @@ const recgen: any = helper.recgen
 const status: typeof statusModule = Aerospike.status
 
 describe('MRT API Tests', function () {
-  helper.skipUnlessVersion('>= 8.0.0', this)
-  helper.skipUnlessEnterprise(this)  
+  helper.skipUnlessVersionAndEnterprise('>= 8.0.0', this)
 
   const client: Cli = helper.client
 

diff --git a/ts-test/tests/mrt_backward_compatible.ts b/ts-test/tests/mrt_backward_compatible.ts
@@ -31,8 +31,8 @@ const recgen: any = helper.recgen
 const status: typeof statusModule = Aerospike.status
 
 describe('MRT functionality tests', function () {
-
-  helper.skipUnlessVersion('< 8.0.0', this)
+  helper.skipUnlessVersionAndCommunity('< 8.0.0', this)
+
   const client: Cli = helper.client
 
   const key1: K = keygen.string(helper.namespace, helper.set, { prefix: 'test/mrt/1' })()
@@ -87,8 +87,8 @@ describe('MRT functionality tests', function () {
     };
 
     await client.put(key2, record2, meta, policy)
-    //await client.put(key3, record2, meta, policy)
-    //await client.put(key4, record2, meta, policy)
+    await client.put(key3, record2, meta, policy)
+    await client.put(key4, record2, meta, policy)
 
     let get_result: AerospikeRecord = await client.get(key2, policy)
     expect(get_result.bins).to.eql(record2)

diff --git a/ts-test/tests/mrt_functionality.ts b/ts-test/tests/mrt_functionality.ts
@@ -31,8 +31,7 @@ const recgen: any = helper.recgen
 const status: typeof statusModule = Aerospike.status
 
 describe('MRT functionality tests', function () {
-  helper.skipUnlessVersion('>= 8.0.0', this)
-  helper.skipUnlessEnterprise(this)
+  helper.skipUnlessVersionAndEnterprise('>= 8.0.0', this)
 
   const client: Cli = helper.client