emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[functional tests] a little bit of tidying

Browse Source
This commit is contained in:
Joe Thornber 2017-08-03 16:12:58 +01:00
parent 5389e8e65a
commit 397d2006a5
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
functional-tests/main.scm
View File

@ -165,9 +165,6 @@
((_ tool-sym) (define (tool-sym . flags) ((_ tool-sym) (define (tool-sym . flags)
(apply run-ok (tool-name 'tool-sym) flags))))) (apply run-ok (tool-name 'tool-sym) flags)))))
;(define (thin-check . flags)
;(apply run-ok "thin_check" flags))
(define-tool thin-check) (define-tool thin-check)
(define-tool thin-delta) (define-tool thin-delta)
(define-tool thin-dump) (define-tool thin-dump)
@ -201,9 +198,8 @@
"metadata.bin") "metadata.bin")
(define (%with-valid-metadata thunk) (define (%with-valid-metadata thunk)
(let ((xml-file (temp-file-containing (fmt #f (generate-xml 10 1000))))) (run-ok "thin_restore" "-i" (temp-thin-xml) "-o" (current-metadata))
(run-ok "thin_restore" "-i" xml-file "-o" (current-metadata)) (thunk))
(thunk)))
(define-syntax with-valid-metadata (define-syntax with-valid-metadata
(syntax-rules () (syntax-rules ()
@ -346,10 +342,9 @@ enough to hold the metadata.")
(scenario thin-restore-tiny-output-file (scenario thin-restore-tiny-output-file
"Fails if the output file is too small." "Fails if the output file is too small."
(let ((outfile (temp-file)) (let ((outfile (temp-file)))
(xml-file (temp-file-containing (fmt #f (generate-xml 10 1000)))))
(run-ok "dd if=/dev/zero" (fmt #f (dsp "of=") (dsp outfile)) "bs=4k count=1") (run-ok "dd if=/dev/zero" (fmt #f (dsp "of=") (dsp outfile)) "bs=4k count=1")
(receive (_ stderr) (run-fail "thin_restore" "-i" xml-file "-o" outfile) (receive (_ stderr) (run-fail "thin_restore" "-i" (temp-thin-xml) "-o" outfile)
(assert-starts-with thin-restore-outfile-too-small-text stderr)))) (assert-starts-with thin-restore-outfile-too-small-text stderr))))
(scenario thin-restore-q (scenario thin-restore-q