Merge pull request #129 from nalind/rotest
Fixups for read-only store tests
This commit is contained in:
commit
04ad0b8270
|
|
@ -58,13 +58,16 @@ load helpers
|
||||||
[ "$output" != "" ]
|
[ "$output" != "" ]
|
||||||
image=${output%% *}
|
image=${output%% *}
|
||||||
|
|
||||||
|
# We no longer need to use the read-only root as a writeable location, so shut it down.
|
||||||
|
storage --graph ${TESTDIR}/ro-root --run ${TESTDIR}/ro-runroot shutdown
|
||||||
|
|
||||||
# Create a third layer based on the second one.
|
# Create a third layer based on the second one.
|
||||||
run storage --storage-opt ${STORAGE_DRIVER}.imagestore=${TESTDIR}/ro-root --debug=false create-layer "$midlayer"
|
run storage --storage-opt ${STORAGE_DRIVER}.imagestore=${TESTDIR}/ro-root --debug=false create-layer "$midlayer"
|
||||||
[ "$status" -eq 0 ]
|
[ "$status" -eq 0 ]
|
||||||
[ "$output" != "" ]
|
[ "$output" != "" ]
|
||||||
upperlayer="$output"
|
upperlayer="$output"
|
||||||
# Mount this layer.
|
# Mount this layer.
|
||||||
run storage --debug=false mount $upperlayer
|
run storage --storage-opt ${STORAGE_DRIVER}.imagestore=${TESTDIR}/ro-root --debug=false mount $upperlayer
|
||||||
[ "$status" -eq 0 ]
|
[ "$status" -eq 0 ]
|
||||||
[ "$output" != "" ]
|
[ "$output" != "" ]
|
||||||
uppermount="$output"
|
uppermount="$output"
|
||||||
|
|
@ -82,7 +85,7 @@ load helpers
|
||||||
[ "$output" != "" ]
|
[ "$output" != "" ]
|
||||||
container="$output"
|
container="$output"
|
||||||
# Mount this container.
|
# Mount this container.
|
||||||
run storage --debug=false mount $container
|
run storage --storage-opt ${STORAGE_DRIVER}.imagestore=${TESTDIR}/ro-root --debug=false mount $container
|
||||||
[ "$status" -eq 0 ]
|
[ "$status" -eq 0 ]
|
||||||
[ "$output" != "" ]
|
[ "$output" != "" ]
|
||||||
containermount="$output"
|
containermount="$output"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue