Skip to content

Commit c675c60

Browse files
committed
In tests use expect over unwrap
1 parent abf67aa commit c675c60

File tree

1 file changed

+12
-6
lines changed
  • rust/operator-binary/src/config

1 file changed

+12
-6
lines changed

rust/operator-binary/src/config/jvm.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,9 @@ mod tests {
130130
&rolegroup,
131131
zookeeper.spec.image.product_version(),
132132
)
133-
.unwrap();
134-
let zk_server_heap_env = construct_zk_server_heap_env(&merged_config).unwrap();
133+
.expect("test: function must pass");
134+
let zk_server_heap_env =
135+
construct_zk_server_heap_env(&merged_config).expect("test: function must pass");
135136

136137
assert_eq!(
137138
non_heap_jvm_args,
@@ -181,8 +182,9 @@ mod tests {
181182
&rolegroup,
182183
zookeeper.spec.image.product_version(),
183184
)
184-
.unwrap();
185-
let zk_server_heap_env = construct_zk_server_heap_env(&merged_config).unwrap();
185+
.expect("test: function must pass");
186+
let zk_server_heap_env =
187+
construct_zk_server_heap_env(&merged_config).expect("test: function must pass");
186188

187189
assert_eq!(
188190
non_heap_jvm_args,
@@ -211,8 +213,12 @@ mod tests {
211213
let rolegroup_ref = zookeeper.server_rolegroup_ref("default");
212214
let merged_config = zookeeper
213215
.merged_config(&zookeeper_role, &rolegroup_ref)
214-
.unwrap();
215-
let role = zookeeper.spec.servers.clone().unwrap();
216+
.expect("test: merged config can be created");
217+
let role = zookeeper
218+
.spec
219+
.servers
220+
.clone()
221+
.expect("test: server role is defined in the ZookeeperCluster");
216222

217223
(zookeeper, merged_config, role, "default".to_owned())
218224
}

0 commit comments

Comments
 (0)