tests: add --testrunner flag so that column tests dont fail on startup
We added a startup panic to prevent users from running as debug mode, our tests are also hitting this. Add a new --testrunner flag which skips this check. We want this separate from the --debug flag so that the tests have a more consistent runtime environment. Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
@@ -7,6 +7,10 @@ pub struct Args {
|
|||||||
pub keys: Vec<Keypair>,
|
pub keys: Vec<Keypair>,
|
||||||
pub light: bool,
|
pub light: bool,
|
||||||
pub debug: bool,
|
pub debug: bool,
|
||||||
|
|
||||||
|
/// Enable when running tests so we don't panic on app startup
|
||||||
|
pub tests: bool,
|
||||||
|
|
||||||
pub use_keystore: bool,
|
pub use_keystore: bool,
|
||||||
pub dbpath: Option<String>,
|
pub dbpath: Option<String>,
|
||||||
pub datapath: Option<String>,
|
pub datapath: Option<String>,
|
||||||
@@ -20,6 +24,7 @@ impl Args {
|
|||||||
keys: vec![],
|
keys: vec![],
|
||||||
light: false,
|
light: false,
|
||||||
debug: false,
|
debug: false,
|
||||||
|
tests: false,
|
||||||
use_keystore: true,
|
use_keystore: true,
|
||||||
dbpath: None,
|
dbpath: None,
|
||||||
datapath: None,
|
datapath: None,
|
||||||
@@ -38,6 +43,8 @@ impl Args {
|
|||||||
res.light = false;
|
res.light = false;
|
||||||
} else if arg == "--debug" {
|
} else if arg == "--debug" {
|
||||||
res.debug = true;
|
res.debug = true;
|
||||||
|
} else if arg == "--testrunner" {
|
||||||
|
res.tests = true;
|
||||||
} else if arg == "--pub" || arg == "--npub" {
|
} else if arg == "--pub" || arg == "--npub" {
|
||||||
i += 1;
|
i += 1;
|
||||||
let pubstr = if let Some(next_arg) = args.get(i) {
|
let pubstr = if let Some(next_arg) = args.get(i) {
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ impl Notedeck {
|
|||||||
.unwrap_or(notedeck::ui::is_compiled_as_mobile());
|
.unwrap_or(notedeck::ui::is_compiled_as_mobile());
|
||||||
|
|
||||||
// Some people have been running notedeck in debug, let's catch that!
|
// Some people have been running notedeck in debug, let's catch that!
|
||||||
if !cfg!(test) && cfg!(debug_assertions) && !parsed_args.debug {
|
if !parsed_args.tests && cfg!(debug_assertions) && !parsed_args.debug {
|
||||||
println!("--- WELCOME TO DAMUS NOTEDECK! ---");
|
println!("--- WELCOME TO DAMUS NOTEDECK! ---");
|
||||||
println!("It looks like are running notedeck in debug mode, unless you are a developer, this is not likely what you want.");
|
println!("It looks like are running notedeck in debug mode, unless you are a developer, this is not likely what you want.");
|
||||||
println!("If you are a developer, run `cargo run -- --debug` to skip this message.");
|
println!("If you are a developer, run `cargo run -- --debug` to skip this message.");
|
||||||
|
|||||||
@@ -130,6 +130,7 @@ mod tests {
|
|||||||
let datapath = create_tmp_dir();
|
let datapath = create_tmp_dir();
|
||||||
let dbpath = create_tmp_dir();
|
let dbpath = create_tmp_dir();
|
||||||
let args: Vec<String> = vec![
|
let args: Vec<String> = vec![
|
||||||
|
"--testrunner",
|
||||||
"--datapath",
|
"--datapath",
|
||||||
&datapath.to_str().unwrap(),
|
&datapath.to_str().unwrap(),
|
||||||
"--dbpath",
|
"--dbpath",
|
||||||
@@ -155,6 +156,7 @@ mod tests {
|
|||||||
let tmpdir = create_tmp_dir();
|
let tmpdir = create_tmp_dir();
|
||||||
let npub = "npub1xtscya34g58tk0z605fvr788k263gsu6cy9x0mhnm87echrgufzsevkk5s";
|
let npub = "npub1xtscya34g58tk0z605fvr788k263gsu6cy9x0mhnm87echrgufzsevkk5s";
|
||||||
let args: Vec<String> = vec![
|
let args: Vec<String> = vec![
|
||||||
|
"--testrunner",
|
||||||
"--no-keystore",
|
"--no-keystore",
|
||||||
"--pub",
|
"--pub",
|
||||||
npub,
|
npub,
|
||||||
|
|||||||
Reference in New Issue
Block a user