aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhai96_ <hvksmr1996@gmail.com>2019-04-19 16:05:44 +0000
committerkhai96_ <hvksmr1996@gmail.com>2019-04-19 16:05:44 +0000
commit03c196b76f28384e4a340312be67aab4a9c7885d (patch)
tree5811584393dfb881605aa789ec3295a7283b12a0
parentFix parse_auth and add some tests (diff)
downloadminiserve-03c196b76f28384e4a340312be67aab4a9c7885d.tar.gz
miniserve-03c196b76f28384e4a340312be67aab4a9c7885d.zip
Use '?'
-rw-r--r--src/args.rs18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/args.rs b/src/args.rs
index c7a4917..00d3c9f 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -173,26 +173,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