aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKunoiSayami <[email protected]>2021-05-13 00:25:45 +0800
committerKunoiSayami <[email protected]>2021-05-13 00:25:45 +0800
commit50bf794d881494f0ef894bf7d7a859d195a69f36 (patch)
tree58d9b99cca8078ad5baa62843f645d1fad66a5f1
parentb2dc72d369bbaec63e823fb8e0de698f1ce3fe3a (diff)
fix(test): Fix test always failure
-rw-r--r--Cargo.lock2
-rw-r--r--Cargo.toml2
-rw-r--r--src/main.rs80
3 files changed, 10 insertions, 74 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 04ceed8..7069e3e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -377,7 +377,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cgit-simple-authentication"
-version = "0.3.3"
+version = "0.3.4"
dependencies = [
"anyhow",
"argon2",
diff --git a/Cargo.toml b/Cargo.toml
index 9457c02..625ca5a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "cgit-simple-authentication"
-version = "0.3.3"
+version = "0.3.4"
authors = ["KunoiSayami <[email protected]>"]
edition = "2018"
diff --git a/src/main.rs b/src/main.rs
index 217cffa..f3dfd85 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -170,7 +170,7 @@ async fn cmd_init(cfg: Config) -> Result<()> {
async fn verify_login(cfg: &Config, data: &FormData, redis_conn: redis::Client) -> Result<bool> {
// TODO: use timestamp to mark file diff
// or copy in init process
- if cfg.test {
+ if !cfg.test {
std::fs::copy(
cfg.get_database_location(),
cfg.get_copied_database_location(),
@@ -498,13 +498,17 @@ fn get_arg_matches(arguments: Option<Vec<&str>>) -> ArgMatches {
.about("Return the login form")
.args(sub_args),
)
- .subcommand(SubCommand::with_name("init").about("Init sqlite database"))
+ .subcommand(
+ SubCommand::with_name("init").about("Init sqlite database")
+ .arg(Arg::with_name("test").long("--test")),
+ )
.subcommand(SubCommand::with_name("users").about("List all register user in database"))
.subcommand(
SubCommand::with_name("adduser")
.about("Add user to database")
.arg(Arg::with_name("user").required(true))
- .arg(Arg::with_name("password").required(true)),
+ .arg(Arg::with_name("password").required(true))
+ .arg(Arg::with_name("test").long("--test")),
)
.subcommand(
SubCommand::with_name("deluser")
@@ -583,27 +587,17 @@ fn main() -> Result<()> {
#[cfg(test)]
mod test {
- use crate::{cmd_init, cmd_add_user};
- use std::path::PathBuf;
use argon2::{
password_hash::{PasswordHash, PasswordVerifier, PasswordHasher, SaltString},
Argon2,
};
+ use rand_core::OsRng;
use crate::{IOModule, get_arg_matches};
use crate::datastructures::{Config, rand_str};
use redis::AsyncCommands;
- use std::time::Duration;
- use std::thread::sleep;
- use std::path::Path;
- const DEFAULT_ADD_USER_ARGS: &[&str] = &["adduser", "hunter2", "hunter2", "--test"];
-
- fn check_if_test_sqlite_only() -> bool {
- std::env::var("TEST_SQLITE").is_ok()
- }
#[test]
fn test_0_argon2() {
- use rand_core::OsRng;
let passwd = b"hunter2";
let salt = SaltString::generate(&mut OsRng);
@@ -696,75 +690,17 @@ mod test {
#[test]
fn test_auth_failure() {
- if check_if_test_sqlite_only() {
- return
- }
let out = test_auth_post();
assert!(out.starts_with("Status: 403"))
}
- #[test]
- fn test_0_init_database() {
- if !check_if_test_sqlite_only() {
- return
- }
- let tmp_dir = Path::new("test");
- use crate::datastructures::Config;
-
- if tmp_dir.exists() {
- std::fs::remove_dir_all(tmp_dir).unwrap();
- }
- std::fs::create_dir(tmp_dir).unwrap();
- let s = std::process::Command::new(std::env::current_exe().unwrap())
- .arg("init --test")
- .spawn()
- .unwrap()
- .wait()
- .unwrap()
- .success();
- }
-
-
- fn lock(path: &std::path::PathBuf, sleep_length: usize) {
- for _ in 0..sleep_length {
- sleep(Duration::from_secs(1));
- if path.exists() {
- break
- }
- }
-
- if !path.exists() {
- panic!("Can't get lock from {}", path.to_str().unwrap())
- }
- }
-
- #[test]
- fn test_1_insert_user() {
- if !check_if_test_sqlite_only() {
- return
- }
- lock(&PathBuf::from("test/tmp.db"), 3);
- std::thread::sleep(std::time::Duration::from_secs(1));
- let s = std::process::Command::new(std::env::current_exe().unwrap())
- .args(DEFAULT_ADD_USER_ARGS)
- .spawn()
- .unwrap()
- .wait()
- .unwrap()
- .success();
- assert!(s);
- }
#[test]
fn test_auth_pass() {
- if check_if_test_sqlite_only() {
- return
- }
let s = test_auth_post();
println!("{}", s);
assert!(s.starts_with("Status: 302"))
-
}
}