Merge pull request #577 from djach7/remove_users_crate

fix: integration-tests: remove users crate
fdo-rs · Nov 27, 2023 · 71624ca · 71624ca
2 parents 913490d + 574d4e4
commit 71624ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -33,7 +33,6 @@ serde_json = "1.0"
 pretty_assertions = "1.0.0"
 paste = "1.0"
 pem = "2.0"
-users = "0.11.0"
 
 fdo-data-formats = { path = "../data-formats" }
 fdo-util = { path = "../util" }
diff --git a/integration-tests/tests/common/mod.rs b/integration-tests/tests/common/mod.rs
@@ -808,21 +808,19 @@ impl<'a> TestServerConfigurator<'a> {
                     &self.test_context.runner_path(&self.server_number),
                 );
 
+                let output = Command::new("whoami").output().unwrap();
+
+                let cur_user = String::from_utf8(output.stdout).unwrap();
+
                 if !per_device {
                     L.l("per_device_serviceinfo is not set, using default values");
-                    cfg.insert(
-                        "user",
-                        users::get_current_username().unwrap().to_str().unwrap(),
-                    );
+                    cfg.insert("user", &cur_user);
                     cfg.insert("sshkey1", "ssh-ed25519 sshkey_default [email protected]");
                     cfg.insert("sshkey2", "ssh-ed25519 sshkey_default [email protected]");
                     cfg.insert("password", "testpassword");
                 } else {
                     L.l("per_device_serviceinfo is set, using device specific values");
-                    cfg.insert(
-                        "user",
-                        users::get_current_username().unwrap().to_str().unwrap(),
-                    );
+                    cfg.insert("user", &cur_user);
                     cfg.insert("sshkey1", "ssh-ed25519 sshkey_per_device [email protected]");
                     cfg.insert("sshkey2", "ssh-ed25519 sshkey_per_device [email protected]");
                     cfg.insert("password", "testpassword");