Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Fix invalid argument order #832

Merged
merged 4 commits into from
Feb 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ pub struct ValidationWorkerCommand {

#[allow(missing_docs)]
#[derive(Debug, StructOpt, Clone)]
#[structopt(settings = &[
structopt::clap::AppSettings::GlobalVersion,
structopt::clap::AppSettings::ArgsNegateSubcommands,
structopt::clap::AppSettings::SubcommandsNegateReqs,
])]
pub struct Cli {
#[allow(missing_docs)]
#[structopt(subcommand)]
Expand Down
30 changes: 30 additions & 0 deletions tests/invalid_order_arguments.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright 2020 Parity Technologies (UK) Ltd.
// This file is part of Substrate.

// Substrate is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// Substrate is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.

use assert_cmd::cargo::cargo_bin;
use std::process::Command;

#[test]
#[cfg(unix)]
fn invalid_order_arguments() {
let base_path = "invalid_order_arguments";

let status = Command::new(cargo_bin("polkadot"))
.args(&["--dev", "invalid_order_arguments", "-d", base_path, "-y"])
.status()
.unwrap();
assert!(!status.success());
}
1 change: 1 addition & 0 deletions tests/purge_chain_works.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ fn purge_chain_works() {
kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
assert!(common::wait_for(&mut cmd, 30).map(|x| x.success()).unwrap_or_default());

// Purge chain
let status = Command::new(cargo_bin("polkadot"))
.args(&["purge-chain", "--dev", "-d", base_path, "-y"])
.status()
Expand Down