Skip to content

Commit 067ccd8

Browse files
committed
fixup! Improve logs and reduce verbosity
1 parent 0f7cc3e commit 067ccd8

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

test/test-manager/src/vm/provision.rs

+13-12
Original file line numberDiff line numberDiff line change
@@ -106,27 +106,28 @@ fn blocking_ssh(
106106

107107
// Transfer a test runner
108108
let source = local_runner_dir.join("test-runner");
109-
ssh_send_file(&session, &source, temp_dir).context("Failed to send test runner to remote")?;
109+
ssh_send_file(&session, &source, temp_dir)
110+
.with_context(|| format!("Failed to send '{source:?}' to remote"))?;
110111

111112
// Transfer connection-checker
112113
let source = local_runner_dir.join("connection-checker");
113114
ssh_send_file(&session, &source, temp_dir)
114-
.context("Failed to send connection-checker to remote")?;
115+
.with_context(|| format!("Failed to send '{source:?}' to remote"))?;
115116

116117
// Transfer app packages
117-
ssh_send_file(&session, &local_app_manifest.app_package_path, temp_dir)
118-
.context("Failed to send current app package to remote")?;
119-
if let Some(app_package_to_upgrade_from_path) =
120-
&local_app_manifest.app_package_to_upgrade_from_path
121-
{
122-
ssh_send_file(&session, app_package_to_upgrade_from_path, temp_dir)
123-
.context("Failed to send previous app package to remote")?;
118+
let source = &local_app_manifest.app_package_path;
119+
ssh_send_file(&session, source, temp_dir)
120+
.with_context(|| format!("Failed to send '{source:?}' to remote"))?;
121+
122+
if let Some(source) = &local_app_manifest.app_package_to_upgrade_from_path {
123+
ssh_send_file(&session, source, temp_dir)
124+
.with_context(|| format!("Failed to send '{source:?}' to remote"))?;
124125
} else {
125126
log::warn!("No previous app package to upgrade from to send to remote")
126127
}
127-
if let Some(gui_package_path) = &local_app_manifest.gui_package_path {
128-
ssh_send_file(&session, gui_package_path, temp_dir)
129-
.context("Failed to send gui_package_path to remote")?;
128+
if let Some(source) = &local_app_manifest.gui_package_path {
129+
ssh_send_file(&session, source, temp_dir)
130+
.with_context(|| format!("Failed to send '{source:?}' to remote"))?;
130131
} else {
131132
log::warn!("No UI e2e test to send to remote")
132133
}

0 commit comments

Comments
 (0)