chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
388f350
)
apitest: Allow reading OtterOutput to a string
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 3 May 2021 13:01:12 +0000
(14:01 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 3 May 2021 13:01:12 +0000
(14:01 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
apitest/apitest.rs
patch
|
blob
|
history
diff --git
a/apitest/apitest.rs
b/apitest/apitest.rs
index 4a277c63ea036f1ef1935d8e2ad2be0e32b66690..5bb53ad0c41a105933294c8f3a6abc4243660475 100644
(file)
--- a/
apitest/apitest.rs
+++ b/
apitest/apitest.rs
@@
-654,6
+654,15
@@
impl From<OtterOutput> for String {
s
}
}
+impl From<&mut OtterOutput> for String {
+ fn from(oo: &mut OtterOutput) -> String {
+ let mut s = String::new();
+ let o = oo.output.as_mut().unwrap();
+ o.rewind().unwrap();
+ o.read_to_string(&mut s).unwrap();
+ s
+ }
+}
impl Drop for OtterOutput {
fn drop(&mut self) {
if let Some(mut o) = self.output.take() {