PR feedback

aws · Aug 8, 2022 · 668ac8c · 668ac8c
1 parent 50cbdfa
commit 668ac8c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 29 deletions.
diff --git a/bindings/rust/integration/Cargo.toml b/bindings/rust/integration/Cargo.toml
@@ -9,7 +9,6 @@ publish = false
 s2n-tls = { path = "../s2n-tls", features = ["testing"] }
 s2n-tls-sys = { path = "../s2n-tls-sys" }
 criterion = { version = "0.3", features = ["html_reports"] }
-subprocess = "0.2.8"
 
 [[bench]]
 name = "handshake"

diff --git a/bindings/rust/integration/benches/s2nc.rs b/bindings/rust/integration/benches/s2nc.rs
@@ -4,7 +4,6 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 use std::{
     dbg, env,
-    io::{self, Write},
     process::Command,
     time::Duration,
 };
@@ -16,18 +15,16 @@ pub fn s2nc(c: &mut Criterion) {
     let s2nc_args: utils::Arguments = s2nc_env.into();
     let test_name = format!("s2nc_{}", s2nc_args.get_endpoint().unwrap());
     dbg!("Parsed test_name as: {:?}", &test_name);
+    let s2nc_env: &str = &env::var("S2NC_ARGS").unwrap();
+    let s2nc_args: utils::Arguments = s2nc_env.into();
     group.bench_function(test_name, move |b| {
         b.iter(|| {
-            let s2nc_env: &str = &env::var("S2NC_ARGS").unwrap();
-            let s2nc_args: utils::Arguments = s2nc_env.into();
-            dbg!("s2nc harness: {:?}", &s2nc_args);
-            let output = Command::new("/usr/local/bin/s2nc")
-                .args(s2nc_args.get_vec())
-                .output()
+            let s2nc_argvec = s2nc_args.clone().get_vec();
+            let status = Command::new("/usr/local/bin/s2nc")
+                .args(s2nc_argvec)
+                .status()
                 .expect("failed to execute process");
-            io::stdout().write_all(&output.stdout).unwrap();
-            io::stderr().write_all(&output.stderr).unwrap();
-            dbg!("DEBUG: return code {:?}", &output.status);
+            assert!(status.success());
         });
     });
 

diff --git a/bindings/rust/integration/benches/s2nd.rs b/bindings/rust/integration/benches/s2nd.rs
@@ -4,28 +4,29 @@
 use criterion::{criterion_group, criterion_main, Criterion};
 use std::{
     env,
-    io::{self, Write},
     process::Command,
 };
+mod utils;
 
 pub fn s2nd(c: &mut Criterion) {
-    let mut group = c.benchmark_group("s2n_server");
-    group.bench_function(
-        format!("{:?}_s2nd", env::var("TOX_TEST_NAME").unwrap()),
-        move |b| {
-            b.iter(|| {
-                let s2nd_args = env::var("S2ND_ARGS").unwrap();
-                assert_ne!(s2nd_args.len(), 0);
-                let output = Command::new("/usr/local/bin/s2nd")
-                    .arg(s2nd_args)
-                    .output()
-                    .expect("failed to execute process");
-
-                io::stdout().write_all(&output.stdout).unwrap();
-                io::stderr().write_all(&output.stderr).unwrap();
-            });
-        },
-    );
+    let mut group = c.benchmark_group("s2nd");
+    let s2nd_env: &str = &env::var("S2ND_ARGS").unwrap();
+    let s2nd_args: utils::Arguments = s2nd_env.into();
+    let test_name = format!("s2nd_{}", s2nd_args.get_endpoint().unwrap());
+    dbg!("Parsed test_name as: {:?}", &test_name);
+    let s2nd_env: &str = &env::var("S2ND_ARGS").unwrap();
+    let s2nd_args: utils::Arguments = s2nd_env.into();
+    dbg!("s2nd harness: {:?}", &s2nd_args);
+    group.bench_function(test_name, move |b| {
+        b.iter(|| {
+            let s2nd_argvec = s2nd_args.clone().get_vec();
+            let status = Command::new("/usr/local/bin/s2nd")
+                .args(s2nd_argvec)
+                .status()
+                .expect("failed to execute process");
+            assert!(status.success());
+        });
+    });
 
     group.finish();
 }