Skip to content

Fix tests for fedora #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 9, 2015
Merged

Fix tests for fedora #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b0bf74
Make sure the tests run when /tmp is not odirect capable
jonludlam Jun 8, 2015
0c56fa2
test.sh: Log the messages from the local allocator
jonludlam Jun 8, 2015
bb7770a
Fix the test.sh script
jonludlam Jun 8, 2015
96c39dd
test.sh: Don't daemonize - run in the background. Capture the logs.
jonludlam Jun 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ mkdir -p /tmp/xenvm.d
./xenvm.native host-create /dev/djstest host1 --configdir /tmp/xenvm.d $MOCK_ARG
./xenvm.native host-connect /dev/djstest host1 --configdir /tmp/xenvm.d $MOCK_ARG
cat test.local_allocator.conf.in | sed -r "s|@BIGDISK@|$LOOP|g" | sed -r "s|@HOST@|host1|g" > test.local_allocator.host1.conf
./local_allocator.native --daemon --config ./test.local_allocator.host1.conf $MOCK_ARG
./local_allocator.native --config ./test.local_allocator.host1.conf $MOCK_ARG > local_allocator.host2.log &

sleep 30 # the local allocator daemonizes too soon

Expand All @@ -62,7 +62,7 @@ sleep 30 # the local allocator daemonizes too soon
./xenvm.native host-create /dev/djstest host2 --configdir /tmp/xenvm.d $MOCK_ARG
./xenvm.native host-connect /dev/djstest host2 --configdir /tmp/xenvm.d $MOCK_ARG
cat test.local_allocator.conf.in | sed -r "s|@BIGDISK@|$LOOP|g" | sed -r "s|@HOST@|host2|g" > test.local_allocator.host2.conf
./local_allocator.native --config ./test.local_allocator.host2.conf $MOCK_ARG > /dev/null &
./local_allocator.native --config ./test.local_allocator.host2.conf $MOCK_ARG > local_allocator.host2.log &

sleep 30
./xenvm.native host-list /dev/djstest --configdir /tmp/xenvm.d $MOCK_ARG
Expand Down
2 changes: 1 addition & 1 deletion test.local_allocator.conf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(
(socket /tmp/@HOST@-socket)
(allocation_quantum 16)
(localJournal /tmp/@HOST@-localJournal)
(localJournal @HOST@-localJournal)
(devices (@BIGDISK@))
(toLVM @HOST@-toLVM)
(fromLVM @HOST@-fromLVM)
Expand Down
23 changes: 15 additions & 8 deletions test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ cat test.xenvmd.conf.in | sed -r "s|@BIGDISK@|$LOOP|g" > test.xenvmd.conf
mkdir -p /etc/xenvm.d
BISECT_FILE=_build/xenvm.coverage ./xenvm.native format $LOOP --vg djstest $MOCK_ARG
BISECT_FILE=_build/xenvmd.coverage ./xenvmd.native --config ./test.xenvmd.conf --daemon

export BISECT_FILE=_build/xenvm.coverage

./xenvm.native set-vg-info --pvpath $LOOP -S /tmp/xenvmd djstest --local-allocator-path /tmp/xenvm-local-allocator --uri file://local/services/xenvmd/djstest $MOCK_ARG
Expand Down Expand Up @@ -88,20 +87,28 @@ sleep 30

./xenvm.native host-list /dev/djstest $MOCK_ARG

xenvmdpid=`pidof xenvmd.native`
#shutdown
./xenvm.native lvchange -an /dev/djstest/live $MOCK_ARG
./xenvm.native shutdown /dev/djstest $MOCK_ARG


wait $(pidof xenvmd.native)
while [ -d /proc/$xenvmdpid ];
do
sleep 1;
done

echo Generating bisect report-- this fails on travis
(cd _build; bisect-report xenvm*.out -summary-only -html /vagrant/report/ || echo Ignoring bisect-report failure)
echo Sending to coveralls-- this only works on travis
`opam config var bin`/ocveralls --prefix _build _build/xenvm*.out --send || echo "Failed to upload to coveralls"

dmsetup remove_all
dd if=/dev/zero of=$LOOP bs=1M count=128
losetup -d $LOOP
dd if=/dev/zero of=$CHENGZLOOP bs=1M count=128
losetup -d $CHENGZLOOP
rm -f localJournal bigdisk *.out chengzDisk
if [ "$USE_MOCK" -eq "0" ]; then
dmsetup remove_all
dd if=/dev/zero of=$LOOP bs=1M count=128
losetup -d $LOOP
dd if=/dev/zero of=$CHENGZLOOP bs=1M count=128
losetup -d $CHENGZLOOP
fi

rm -f localJournal bigdisk *.out chengzDisk
2 changes: 1 addition & 1 deletion test/common.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ let tib = Int64.(gib * kib)
module Client = Xenvm_client.Client

let with_temp_file fn =
let filename = "/tmp/vg" in
let filename = Filename.concat (Unix.getcwd ()) "vg" in
let f = Unix.openfile filename [Unix.O_CREAT; Unix.O_RDWR; Unix.O_TRUNC] 0o644 in
(* approximately 10000 4MiB extents for volumes, 100MiB for metadata and
overhead *)
Expand Down