api_server: consistently organize unit tests

Some nit changes for consistently organizing unit tests
across all types of requests.

Signed-off-by: Diana Popa <[email protected]>

src/api_server/src/request/actions.rs

@@ -10,7 +10,7 @@ use request::{Body, Error, ParsedRequest, StatusCode};
 // The names of the members from this enum must precisely correspond (as a string) to the possible
 // values of "action_type" from the json request body. This is useful to get a strongly typed
 // struct from the Serde deserialization process.
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Deserialize, Serialize)]
 enum ActionType {
     BlockDeviceRescan,
     FlushMetrics,
@@ -20,9 +20,9 @@ enum ActionType {
 
 // The model of the json body from a sync request. We use Serde to transform each associated
 // json body into this.
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
-pub struct ActionBody {
+struct ActionBody {
     action_type: ActionType,
     #[serde(skip_serializing_if = "Option::is_none")]
     payload: Option<Value>,
@@ -162,7 +162,7 @@ mod tests {
     }
 
     #[test]
-    fn test_into_parsed_request() {
+    fn test_parse_put_actions_request() {
         {
             assert!(parse_put_actions(&Body::new("invalid_body")).is_err());
 

src/api_server/src/request/drive.rs

@@ -141,7 +141,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_parse_patch_request() {
+    fn test_parse_patch_drive_request() {
         assert!(parse_patch_drive(&Body::new("invalid_payload"), None).is_err());
         assert!(parse_patch_drive(&Body::new("invalid_payload"), Some(&"id")).is_err());
 
@@ -218,7 +218,7 @@ mod tests {
     }
 
     #[test]
-    fn test_parse_put_request() {
+    fn test_parse_put_drive_request() {
         assert!(parse_put_drive(&Body::new("invalid_payload"), None).is_err());
         assert!(parse_put_drive(&Body::new("invalid_payload"), Some(&"id")).is_err());
 

src/api_server/src/request/instance_info.rs

@@ -14,7 +14,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_parse_request() {
+    fn test_parse_get_instance_info_request() {
         match parse_get_instance_info() {
             Ok(ParsedRequest::GetInstanceInfo) => {}
             _ => panic!("Test failed."),

src/api_server/src/request/logger.rs

@@ -22,7 +22,7 @@ mod tests {
     use vmm::vmm_config::logger::LoggerLevel;
 
     #[test]
-    fn test_parse_logger_request() {
+    fn test_parse_put_logger_request() {
         let body = r#"{
                 "log_fifo": "log",
                 "metrics_fifo": "metrics",

src/api_server/src/request/net.rs

@@ -62,7 +62,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn parse_put_net_request() {
+    fn test_parse_put_net_request() {
         let body = r#"{
                 "iface_id": "foo",
                 "host_dev_name": "bar",
@@ -105,7 +105,7 @@ mod tests {
     }
 
     #[test]
-    fn parse_patch_net_request() {
+    fn test_parse_patch_net_request() {
         let body = r#"{
                 "iface_id": "foo",
                 "rx_rate_limiter": {

src/api_server/src/request/vsock.rs

@@ -16,7 +16,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn test_parse_vsock_request() {
+    fn test_parse_put_vsock_request() {
         let body = r#"{
                 "vsock_id": "foo",
                 "guest_cid": 42,

tests/integration_tests/build/test_coverage.py

@@ -19,7 +19,7 @@
 
 import host_tools.cargo_build as host  # pylint: disable=import-error
 
-COVERAGE_TARGET_PCT = 84.90
+COVERAGE_TARGET_PCT = 85.10
 COVERAGE_MAX_DELTA = 0.05
 
 CARGO_KCOV_REL_PATH = os.path.join(host.CARGO_BUILD_REL_PATH, 'kcov')