Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(test): unifying dan layer integration tests #4175

Merged
merged 10 commits into from
Jun 9, 2022
Merged

fix(test): unifying dan layer integration tests #4175

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b9ba38c
unify cucumber tags and mark broken tests
mrnaveira Jun 8, 2022
8cf8533
fix contract definition steps due to the new cli
mrnaveira Jun 8, 2022
e8582b0
fix steps for contract constitution
mrnaveira Jun 8, 2022
acd8572
consistent naming of contract constitution
mrnaveira Jun 8, 2022
8e383b1
tag contract acceptance test as broken
mrnaveira Jun 8, 2022
7f5203b
tag working dan tests as critical to run on ci
mrnaveira Jun 8, 2022
c6cd911
give more room for mining contract tx in tests
mrnaveira Jun 8, 2022
5f509f2
Improve comment on wallet cli arguments
mrnaveira Jun 9, 2022
1937583
fix eslint warning
mrnaveira Jun 9, 2022
8f400b5
Merge branch 'development' into fix-dan-tests
aviator-app[bot] Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions integration_tests/features/NFT.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

@dan
Feature: NFT

@broken
Scenario: Minting tokens
Given I have a seed node SEED
And I have wallet WALLET_A connected to seed node SEED
Expand All @@ -26,6 +28,7 @@ Feature: NFT
Then I have token TOKEN1 for asset FACTORY on wallet WALLET_B in state ENCUMBEREDTOBERECEIVED
Then I have asset FACTORY on wallet WALLET_A with status ENCUMBEREDTOBERECEIVED

@broken
Scenario: Minting tokens via command line
Given I have a seed node SEED
And I have wallet WALLET_A connected to seed node SEED
Expand Down
4 changes: 3 additions & 1 deletion integration_tests/features/ValidatorNode.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@

@dan
Feature: Validator Node
@broken
Scenario: Test committee
Given I have committee from 4 validator nodes connected
Then I send instruction successfully with metadata {"issuer" : {"num_clicks" : 1}}
Then At least 3 out of 4 validator nodes have filled asset data

@current
@current @broken
Scenario: Start asset
Given I have a seed node NODE1
And I have wallet WALLET1 connected to all seed nodes
Expand All @@ -20,6 +21,7 @@ Feature: Validator Node
And I create 40 NFTs
And I mine 3 blocks

@broken
Scenario: Publish contract acceptance
Given I have a seed node NODE1
And I have wallet WALLET1 connected to all seed nodes
Expand Down
14 changes: 7 additions & 7 deletions integration_tests/features/WalletCli.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,26 +152,26 @@ Feature: Wallet CLI
And mining node MINE mines 1 blocks
Then WALLET is connected to BASE

@dan_layer
@dan @critical
Scenario: As a user I want to publish a contract definition via command line
Given I have a base node BASE
And I have wallet WALLET connected to base node BASE
And I have mining node MINE connected to base node BASE and wallet WALLET
And mining node MINE mines 4 blocks
Then I wait for wallet WALLET to have at least 1000000 uT
And I create a "contract-definition" from file "fixtures/contract_definition.json" on wallet WALLET via command line
And mining node MINE mines 4 blocks
And I publish a contract definition from file "fixtures/contract_definition.json" on wallet WALLET via command line
And mining node MINE mines 8 blocks
Then wallet WALLET has at least 1 transactions that are all TRANSACTION_STATUS_MINED_CONFIRMED and not cancelled
Then WALLET is connected to BASE

@dan_layer
Scenario: As a user I want to publish a constitution definition via command line
@dan @critical
Scenario: As a user I want to publish a contract constitution via command line
Given I have a base node BASE
And I have wallet WALLET connected to base node BASE
And I have mining node MINE connected to base node BASE and wallet WALLET
And mining node MINE mines 4 blocks
Then I wait for wallet WALLET to have at least 1000000 uT
And I create a "constitution-definition" from file "fixtures/constitution_definition.json" on wallet WALLET via command line
And mining node MINE mines 4 blocks
And I publish a contract constitution from file "fixtures/contract_constitution.json" on wallet WALLET via command line
sdbondi marked this conversation as resolved.
Show resolved Hide resolved
And mining node MINE mines 8 blocks
Then wallet WALLET has at least 1 transactions that are all TRANSACTION_STATUS_MINED_CONFIRMED and not cancelled
Then WALLET is connected to BASE
21 changes: 18 additions & 3 deletions integration_tests/features/support/wallet_cli_steps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,14 +301,29 @@ Then(
);

Then(
"I create a {string} from file {string} on wallet {word} via command line",
"I publish a contract definition from file {string} on wallet {word} via command line",
{ timeout: 120 * 1000 },
async function (definition_type, relative_file_path, wallet_name) {
async function (relative_file_path, wallet_name) {
let absolute_path = path.resolve(relative_file_path);
let wallet = this.getWallet(wallet_name);
let output = await wallet_run_command(
wallet,
`publish-${definition_type} --json-file ${absolute_path}`
`contract-definition publish ${absolute_path}`
);
console.log(output.buffer);
}
);

Then(
"I publish a contract constitution from file {string} on wallet {word} via command line",
{ timeout: 120 * 1000 },
async function (relative_file_path, wallet_name) {
let absolute_path = path.resolve(relative_file_path);
let wallet = this.getWallet(wallet_name);

let output = await wallet_run_command(
wallet,
`publish-constitution-definition ${absolute_path}`
);
console.log(output.buffer);
}
Expand Down
0 ...sts/fixtures/constitution_definition.json → ...tests/fixtures/contract_constitution.json
View file
Open in desktop
File renamed without changes.
16 changes: 11 additions & 5 deletions integration_tests/helpers/walletProcess.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@ class WalletProcess {
this.options["grpc_console_wallet_address"].match(/tcp\/(\d+)/);
this.grpcPort = parseInt(regexMatch[1]);
}

console.log(`--------------------- ${this.name} ----------------------`);
console.log(overrides);
const configArgs = [];
Object.keys(overrides).forEach((k) => {
args.push("-p");
args.push(`${k}=${overrides[k]}`);
configArgs.push("-p");
configArgs.push(`${k}=${overrides[k]}`);
});
if (saveFile) {
// clear the .env file
Expand All @@ -113,7 +115,7 @@ class WalletProcess {
});
}

const ps = spawn(cmd, args, {
const ps = spawn(cmd, [...configArgs, ...args], {
cwd: this.baseDir,
// shell: true,
env: { ...process.env },
Expand Down Expand Up @@ -278,22 +280,26 @@ class WalletProcess {
".",
"--password",
"kensentme",
"--command",
command,
"--non-interactive",
"--network",
"localnet",
];
if (this.logFilePath) {
args.push("--log-config", this.logFilePath);
}

const overrides = this.getOverrides();
Object.keys(overrides).forEach((k) => {
args.push("-p");
args.push(`${k}=${overrides[k]}`);
});

// Append command arguments
args.push(...command.split(" "));

let output = { buffer: "" };
// In case we killed the wallet fast send enter. Because it will ask for the logs again (e.g. whois test)

await this.run(await this.compile(), args, true, "\n", output, true);
return output;
}
Expand Down