From 4cf516471303e5917ce5ba1f8df7731e7c9c5e3c Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Thu, 26 Sep 2024 15:30:32 +0300 Subject: [PATCH 1/4] test(dashmate): e2e tests failing due to DKG interval check Fixes #2170 --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/dashpay/platform/issues/2170?shareId=XXXX-XXXX-XXXX-XXXX). --- packages/dashmate/test/e2e/localNetwork.spec.js | 2 ++ packages/dashmate/test/e2e/testnetEvonode.spec.js | 1 + packages/dashmate/test/e2e/testnetFullnode.spec.js | 2 ++ 3 files changed, 5 insertions(+) diff --git a/packages/dashmate/test/e2e/localNetwork.spec.js b/packages/dashmate/test/e2e/localNetwork.spec.js index d1f8c7bb7b8..3825216d079 100644 --- a/packages/dashmate/test/e2e/localNetwork.spec.js +++ b/packages/dashmate/test/e2e/localNetwork.spec.js @@ -129,6 +129,7 @@ describe('Local Network', function main() { const task = restartNodeTask(config); await task.run({ isVerbose: true, + isSafe: true, }); } @@ -146,6 +147,7 @@ describe('Local Network', function main() { const task = stopNodeTask(config); await task.run({ isVerbose: true, + isSafe: true, }); } diff --git a/packages/dashmate/test/e2e/testnetEvonode.spec.js b/packages/dashmate/test/e2e/testnetEvonode.spec.js index 1e8f90d5ab4..9ad37c3edbb 100644 --- a/packages/dashmate/test/e2e/testnetEvonode.spec.js +++ b/packages/dashmate/test/e2e/testnetEvonode.spec.js @@ -209,6 +209,7 @@ describe('Testnet Evonode', function main() { await task.run({ isVerbose: true, platformOnly: true, + isSafe: true, }); await assertServiceRunning(config, 'core', true); diff --git a/packages/dashmate/test/e2e/testnetFullnode.spec.js b/packages/dashmate/test/e2e/testnetFullnode.spec.js index 12329f3407f..01d36b61dbd 100644 --- a/packages/dashmate/test/e2e/testnetFullnode.spec.js +++ b/packages/dashmate/test/e2e/testnetFullnode.spec.js @@ -141,6 +141,7 @@ describe('Testnet Fullnode', function main() { await task.run({ isVerbose: true, + isSafe: true, }); await assertServiceRunning(config, 'core'); @@ -160,6 +161,7 @@ describe('Testnet Fullnode', function main() { await task.run({ isVerbose: true, + isSafe: true, }); await assertServiceRunning(config, 'core', false); From 49d08ce70cd6f9f5128e0f69bd726ff869f5c9a9 Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Thu, 26 Sep 2024 16:11:42 +0300 Subject: [PATCH 2/4] Update e2e tests to include `--force` flag for skipping DKG interval check * **localNetwork.spec.js** - Add `isForce: true` to `restart` and `stop` tests * **testnetEvonode.spec.js** - Replace `isSafe: true` with `isForce: true` in `restart` and `stop` tests * **testnetFullnode.spec.js** - Add `isForce: true` to `restart` and `stop` tests --- packages/dashmate/test/e2e/localNetwork.spec.js | 4 ++-- packages/dashmate/test/e2e/testnetEvonode.spec.js | 4 ++-- packages/dashmate/test/e2e/testnetFullnode.spec.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/dashmate/test/e2e/localNetwork.spec.js b/packages/dashmate/test/e2e/localNetwork.spec.js index 3825216d079..ab44a55991d 100644 --- a/packages/dashmate/test/e2e/localNetwork.spec.js +++ b/packages/dashmate/test/e2e/localNetwork.spec.js @@ -129,7 +129,7 @@ describe('Local Network', function main() { const task = restartNodeTask(config); await task.run({ isVerbose: true, - isSafe: true, + isForce: true, }); } @@ -147,7 +147,7 @@ describe('Local Network', function main() { const task = stopNodeTask(config); await task.run({ isVerbose: true, - isSafe: true, + isForce: true, }); } diff --git a/packages/dashmate/test/e2e/testnetEvonode.spec.js b/packages/dashmate/test/e2e/testnetEvonode.spec.js index 9ad37c3edbb..3fde4b01d74 100644 --- a/packages/dashmate/test/e2e/testnetEvonode.spec.js +++ b/packages/dashmate/test/e2e/testnetEvonode.spec.js @@ -148,7 +148,7 @@ describe('Testnet Evonode', function main() { await task.run({ isVerbose: true, - isSafe: true, + isForce: true, }); // TODO: Assert all services are running @@ -233,7 +233,7 @@ describe('Testnet Evonode', function main() { await task.run({ isVerbose: true, - isSafe: true, + isForce: true, }); // TODO: Assert all services are running diff --git a/packages/dashmate/test/e2e/testnetFullnode.spec.js b/packages/dashmate/test/e2e/testnetFullnode.spec.js index 01d36b61dbd..7d8ccc43d08 100644 --- a/packages/dashmate/test/e2e/testnetFullnode.spec.js +++ b/packages/dashmate/test/e2e/testnetFullnode.spec.js @@ -141,7 +141,7 @@ describe('Testnet Fullnode', function main() { await task.run({ isVerbose: true, - isSafe: true, + isForce: true, }); await assertServiceRunning(config, 'core'); @@ -161,7 +161,7 @@ describe('Testnet Fullnode', function main() { await task.run({ isVerbose: true, - isSafe: true, + isForce: true, }); await assertServiceRunning(config, 'core', false); From 68d6f18d4b46aa4a6a8db6cf912e654983305085 Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Thu, 26 Sep 2024 16:18:14 +0300 Subject: [PATCH 3/4] Update testnetEvonode.spec.js --- packages/dashmate/test/e2e/testnetEvonode.spec.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/dashmate/test/e2e/testnetEvonode.spec.js b/packages/dashmate/test/e2e/testnetEvonode.spec.js index 3fde4b01d74..1e8f90d5ab4 100644 --- a/packages/dashmate/test/e2e/testnetEvonode.spec.js +++ b/packages/dashmate/test/e2e/testnetEvonode.spec.js @@ -148,7 +148,7 @@ describe('Testnet Evonode', function main() { await task.run({ isVerbose: true, - isForce: true, + isSafe: true, }); // TODO: Assert all services are running @@ -209,7 +209,6 @@ describe('Testnet Evonode', function main() { await task.run({ isVerbose: true, platformOnly: true, - isSafe: true, }); await assertServiceRunning(config, 'core', true); @@ -233,7 +232,7 @@ describe('Testnet Evonode', function main() { await task.run({ isVerbose: true, - isForce: true, + isSafe: true, }); // TODO: Assert all services are running From 0b268dad69cad78fec01c80505f3bea9ec1bf1f9 Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Thu, 26 Sep 2024 16:19:29 +0300 Subject: [PATCH 4/4] Update testnetFullnode.spec.js --- packages/dashmate/test/e2e/testnetFullnode.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dashmate/test/e2e/testnetFullnode.spec.js b/packages/dashmate/test/e2e/testnetFullnode.spec.js index 7d8ccc43d08..01d36b61dbd 100644 --- a/packages/dashmate/test/e2e/testnetFullnode.spec.js +++ b/packages/dashmate/test/e2e/testnetFullnode.spec.js @@ -141,7 +141,7 @@ describe('Testnet Fullnode', function main() { await task.run({ isVerbose: true, - isForce: true, + isSafe: true, }); await assertServiceRunning(config, 'core'); @@ -161,7 +161,7 @@ describe('Testnet Fullnode', function main() { await task.run({ isVerbose: true, - isForce: true, + isSafe: true, }); await assertServiceRunning(config, 'core', false);