Skip to content

Commit 8a6785d

Browse files
committed
fix paths to proc test data
1 parent f20ba55 commit 8a6785d

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

bottlecap/src/proc/mod.rs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -365,19 +365,19 @@ mod tests {
365365
assert!((network_data.tx_bytes - 254.0).abs() < f64::EPSILON);
366366

367367
let path = "./tests/proc/net/invalid_dev_malformed";
368-
let network_data_result = get_network_data_from_path(path);
368+
let network_data_result = get_network_data_from_path(path_from_root(path).as_str());
369369
assert!(network_data_result.is_err());
370370

371371
let path = "./tests/proc/net/invalid_dev_non_numerical_value";
372-
let network_data_result = get_network_data_from_path(path);
372+
let network_data_result = get_network_data_from_path(path_from_root(path).as_str());
373373
assert!(network_data_result.is_err());
374374

375375
let path = "./tests/proc/net/missing_interface_dev";
376-
let network_data_result = get_network_data_from_path(path);
376+
let network_data_result = get_network_data_from_path(path_from_root(path).as_str());
377377
assert!(network_data_result.is_err());
378378

379379
let path = "./tests/proc/net/nonexistent_dev";
380-
let network_data_result = get_network_data_from_path(path);
380+
let network_data_result = get_network_data_from_path(path_from_root(path).as_str());
381381
assert!(network_data_result.is_err());
382382
}
383383

@@ -411,27 +411,27 @@ mod tests {
411411
);
412412

413413
let path = "./tests/proc/stat/invalid_stat_non_numerical_value_1";
414-
let cpu_data_result = get_cpu_data_from_path(path);
414+
let cpu_data_result = get_cpu_data_from_path(path_from_root(path).as_str());
415415
assert!(cpu_data_result.is_err());
416416

417417
let path = "./tests/proc/stat/invalid_stat_non_numerical_value_2";
418-
let cpu_data_result = get_cpu_data_from_path(path);
418+
let cpu_data_result = get_cpu_data_from_path(path_from_root(path).as_str());
419419
assert!(cpu_data_result.is_err());
420420

421421
let path = "./tests/proc/stat/invalid_stat_malformed_first_line";
422-
let cpu_data_result = get_cpu_data_from_path(path);
422+
let cpu_data_result = get_cpu_data_from_path(path_from_root(path).as_str());
423423
assert!(cpu_data_result.is_err());
424424

425425
let path = "./tests/proc/stat/invalid_stat_malformed_per_cpu_line";
426-
let cpu_data_result = get_cpu_data_from_path(path);
426+
let cpu_data_result = get_cpu_data_from_path(path_from_root(path).as_str());
427427
assert!(cpu_data_result.is_err());
428428

429429
let path = "./tests/proc/stat/invalid_stat_missing_cpun_data";
430-
let cpu_data_result = get_cpu_data_from_path(path);
430+
let cpu_data_result = get_cpu_data_from_path(path_from_root(path).as_str());
431431
assert!(cpu_data_result.is_err());
432432

433433
let path = "./tests/proc/stat/nonexistent_stat";
434-
let cpu_data_result = get_cpu_data_from_path(path);
434+
let cpu_data_result = get_cpu_data_from_path(path_from_root(path).as_str());
435435
assert!(cpu_data_result.is_err());
436436
}
437437

@@ -444,32 +444,32 @@ mod tests {
444444
assert!((uptime_data - 3_213_103_123_000.0).abs() < f64::EPSILON);
445445

446446
let path = "./tests/proc/uptime/invalid_data_uptime";
447-
let uptime_data_result = get_uptime_from_path(path);
447+
let uptime_data_result = get_uptime_from_path(path_from_root(path).as_str());
448448
assert!(uptime_data_result.is_err());
449449

450450
let path = "./tests/proc/uptime/malformed_uptime";
451-
let uptime_data_result = get_uptime_from_path(path);
451+
let uptime_data_result = get_uptime_from_path(path_from_root(path).as_str());
452452
assert!(uptime_data_result.is_err());
453453

454454
let path = "./tests/proc/uptime/nonexistent_uptime";
455-
let uptime_data_result = get_uptime_from_path(path);
455+
let uptime_data_result = get_uptime_from_path(path_from_root(path).as_str());
456456
assert!(uptime_data_result.is_err());
457457
}
458458

459459
#[test]
460460
fn test_get_fd_max_data() {
461461
let path = "./tests/proc/process/valid";
462462
let pids = get_pid_list_from_path(path_from_root(path).as_str());
463-
let fd_max = get_fd_max_data_from_path(path, &pids);
463+
let fd_max = get_fd_max_data_from_path(path_from_root(path).as_str(), &pids);
464464
assert!((fd_max - 900.0).abs() < f64::EPSILON);
465465

466466
let path = "./tests/proc/process/invalid_malformed";
467-
let fd_max = get_fd_max_data_from_path(path, &pids);
467+
let fd_max = get_fd_max_data_from_path(path_from_root(path).as_str(), &pids);
468468
// assert that fd_max is equal to AWS Lambda limit
469469
assert!((fd_max - constants::LAMBDA_FILE_DESCRIPTORS_DEFAULT_LIMIT).abs() < f64::EPSILON);
470470

471471
let path = "./tests/proc/process/invalid_missing";
472-
let fd_max = get_fd_max_data_from_path(path, &pids);
472+
let fd_max = get_fd_max_data_from_path(path_from_root(path).as_str(), &pids);
473473
// assert that fd_max is equal to AWS Lambda limit
474474
assert!((fd_max - constants::LAMBDA_FILE_DESCRIPTORS_DEFAULT_LIMIT).abs() < f64::EPSILON);
475475
}
@@ -478,27 +478,27 @@ mod tests {
478478
fn test_get_fd_use_data() {
479479
let path = "./tests/proc/process/valid";
480480
let pids = get_pid_list_from_path(path_from_root(path).as_str());
481-
let fd_use = get_fd_use_data_from_path(path, &pids);
481+
let fd_use = get_fd_use_data_from_path(path_from_root(path).as_str(), &pids);
482482
assert!((fd_use - 5.0).abs() < f64::EPSILON);
483483
}
484484

485485
#[test]
486486
fn test_get_threads_max_data() {
487487
let path = "./tests/proc/process/valid";
488488
let pids = get_pid_list_from_path(path_from_root(path).as_str());
489-
let threads_max = get_threads_max_data_from_path(path, &pids);
489+
let threads_max = get_threads_max_data_from_path(path_from_root(path).as_str(), &pids);
490490
assert!((threads_max - 1024.0).abs() < f64::EPSILON);
491491

492492
let path = "./tests/proc/process/invalid_malformed";
493-
let threads_max = get_threads_max_data_from_path(path, &pids);
493+
let threads_max = get_threads_max_data_from_path(path_from_root(path).as_str(), &pids);
494494
// assert that threads_max is equal to AWS Lambda limit
495495
assert!(
496496
(threads_max - constants::LAMBDA_EXECUTION_PROCESSES_DEFAULT_LIMIT).abs()
497497
< f64::EPSILON
498498
);
499499

500500
let path = "./tests/proc/process/invalid_missing";
501-
let threads_max = get_threads_max_data_from_path(path, &pids);
501+
let threads_max = get_threads_max_data_from_path(path_from_root(path).as_str(), &pids);
502502
// assert that threads_max is equal to AWS Lambda limit
503503
assert!(
504504
(threads_max - constants::LAMBDA_EXECUTION_PROCESSES_DEFAULT_LIMIT).abs()
@@ -510,13 +510,13 @@ mod tests {
510510
fn test_get_threads_use_data() {
511511
let path = "./tests/proc/process/valid";
512512
let pids = get_pid_list_from_path(path_from_root(path).as_str());
513-
let threads_use_result = get_threads_use_data_from_path(path, &pids);
513+
let threads_use_result = get_threads_use_data_from_path(path_from_root(path).as_str(), &pids);
514514
assert!(threads_use_result.is_ok());
515515
let threads_use = threads_use_result.unwrap();
516516
assert!((threads_use - 5.0).abs() < f64::EPSILON);
517517

518518
let path = "./tests/proc/process/invalid_missing";
519-
let threads_use_result = get_threads_use_data_from_path(path, &pids);
519+
let threads_use_result = get_threads_use_data_from_path(path_from_root(path).as_str(), &pids);
520520
assert!(threads_use_result.is_err());
521521
}
522522
}

0 commit comments

Comments
 (0)