aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkhai96_ <hvksmr1996@gmail.com>2019-04-19 19:23:56 +0000
committerkhai96_ <hvksmr1996@gmail.com>2019-04-19 19:23:56 +0000
commitced68a4129a1cb525fc4b5194e9c6875fa78fc40 (patch)
tree983bcc8991af7f1c6d34ad2ceb262620dac11dae /src
parentResolve https://github.com/svenstaro/miniserve/pull/76#discussion_r277011948 (diff)
parentUse '?' (diff)
downloadminiserve-ced68a4129a1cb525fc4b5194e9c6875fa78fc40.tar.gz
miniserve-ced68a4129a1cb525fc4b5194e9c6875fa78fc40.zip
Merge branches 'pullrequest.hashed-password.alt0' and 'pullrequest.hashed-password.alt1' into pullrequest.hashed-password
Diffstat (limited to 'src')
-rw-r--r--src/args.rs18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/args.rs b/src/args.rs
index d26fb41..25d70ad 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -172,26 +172,32 @@ mod tests {
}
#[test]
- fn parse_auth_plain() {
+ fn parse_auth_plain() -> Result<(), String> {
assert_eq!(
- parse_auth("username:password").unwrap(),
+ parse_auth("username:password")?,
create_required_auth("username", "password", "plain")
);
+
+ Ok(())
}
#[test]
- fn parse_auth_sha256() {
+ fn parse_auth_sha256() -> Result<(), String> {
assert_eq!(
- parse_auth("username:sha256:hash").unwrap(),
+ parse_auth("username:sha256:hash")?,
create_required_auth("username", "hash", "sha256")
);
+
+ Ok(())
}
#[test]
- fn parse_auth_sha512() {
+ fn parse_auth_sha512() -> Result<(), String> {
assert_eq!(
- parse_auth("username:sha512:hash").unwrap(),
+ parse_auth("username:sha512:hash")?,
create_required_auth("username", "hash", "sha512")
);
+
+ Ok(())
}
} \ No newline at end of file