bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Alex Young
2012-09-12 15:43:15 +01:00
parent ccf5baa956 ee652a2965
commit 50001cd6e7
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ioutil.c
View File

@@ -21,7 +21,7 @@ struct bitset_mapping* build_allocation_map(int fd, uint64_t size, int resolutio
fiemap_count->fm_start = 0; fiemap_count->fm_start = 0;
fiemap_count->fm_length = size; fiemap_count->fm_length = size;
fiemap_count->fm_flags = 0; fiemap_count->fm_flags = FIEMAP_FLAG_SYNC;
fiemap_count->fm_extent_count = 0; fiemap_count->fm_extent_count = 0;
fiemap_count->fm_mapped_extents = 0; fiemap_count->fm_mapped_extents = 0;

11
tests/acceptance/test_happy_path.rb
View File

@@ -74,10 +74,10 @@ class TestHappyPath < Test::Unit::TestCase
def test_mirror def test_mirror
setup_to_mirror()
@env.nbd1.can_die @env.nbd1.can_die
@env.nbd2.can_die(0) @env.nbd2.can_die(0)
setup_to_mirror()
stdout, stderr = @env.mirror12 stdout, stderr = @env.mirror12
@env.nbd1.join @env.nbd1.join
@@ -91,14 +91,16 @@ class TestHappyPath < Test::Unit::TestCase
def test_mirror_unlink def test_mirror_unlink
@env.nbd1.can_die(0)
@env.nbd2.can_die(0)
setup_to_mirror() setup_to_mirror()
assert File.file?( @env.filename1 ) assert File.file?( @env.filename1 )
stdout, stderr = @env.mirror12_unlink stdout, stderr = @env.mirror12_unlink
assert_no_match( /unrecognized/, stderr ) assert_no_match( /unrecognized/, stderr )
@env.nbd1.can_die(0)
@env.nbd2.can_die(0)
Timeout.timeout(2) do @env.nbd1.join end Timeout.timeout(2) do @env.nbd1.join end
@@ -128,3 +130,4 @@ class TestHappyPath < Test::Unit::TestCase
end end
end end