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

Moved acceptance tests into tests/acceptance

Browse Source
This commit is contained in:
Alex Young
2012-07-03 10:59:31 +01:00
parent c0c9c6f076
commit 988b2ec014
20 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Rakefile
View File

@@ -11,9 +11,7 @@ ALL_SOURCES =FileList['src/*']
SOURCES = ALL_SOURCES.select { |c| c =~ /\.c$/ } SOURCES = ALL_SOURCES.select { |c| c =~ /\.c$/ }
OBJECTS = SOURCES.pathmap( "%{^src,build}X.o" ) OBJECTS = SOURCES.pathmap( "%{^src,build}X.o" )
TEST_SOURCES = FileList['tests/unit/*.c'] TEST_SOURCES = FileList['tests/unit/*.c']
p TEST_SOURCES
TEST_OBJECTS = TEST_SOURCES.pathmap( "%{^tests/unit,build/tests}X.o" ) TEST_OBJECTS = TEST_SOURCES.pathmap( "%{^tests/unit,build/tests}X.o" )
p TEST_OBJECTS
LIBS = %w( pthread ) LIBS = %w( pthread )
CCFLAGS = %w( CCFLAGS = %w(
@@ -68,7 +66,7 @@ namespace "test" do
desc "Run NBD test scenarios" desc "Run NBD test scenarios"
task 'scenarios' => 'flexnbd' do task 'scenarios' => 'flexnbd' do
sh "cd tests; ruby nbd_scenarios" sh "cd tests/acceptance; ruby nbd_scenarios"
end end
end end

0
tests/fakes/dest/close_after_hello.rb → tests/acceptance/fakes/dest/close_after_hello.rb
View File

0
tests/fakes/dest/error_on_write.rb → tests/acceptance/fakes/dest/error_on_write.rb
View File

0
tests/fakes/dest/hang_after_connect.rb → tests/acceptance/fakes/dest/hang_after_connect.rb
View File

0
tests/fakes/dest/hang_after_write.rb → tests/acceptance/fakes/dest/hang_after_write.rb
View File

0
tests/fakes/dest/hello_wrong_magic.rb → tests/acceptance/fakes/dest/hello_wrong_magic.rb
View File

0
tests/fakes/dest/hello_wrong_size.rb → tests/acceptance/fakes/dest/hello_wrong_size.rb
View File

0
tests/fakes/dest/reject_acl.rb → tests/acceptance/fakes/dest/reject_acl.rb
View File

0
tests/fakes/source/close_after_connect.rb → tests/acceptance/fakes/source/close_after_connect.rb
View File

0
tests/fakes/source/close_after_hello.rb → tests/acceptance/fakes/source/close_after_hello.rb
View File

0
tests/fakes/source/connect_during_hello.rb → tests/acceptance/fakes/source/connect_during_hello.rb
View File

0
tests/fakes/source/connect_from_banned_ip.rb → tests/acceptance/fakes/source/connect_from_banned_ip.rb
View File

0
tests/fakes/source/hang_after_hello.rb → tests/acceptance/fakes/source/hang_after_hello.rb
View File

0
tests/fakes/source/write_out_of_range.rb → tests/acceptance/fakes/source/write_out_of_range.rb
View File

0
tests/flexnbd.rb → tests/acceptance/flexnbd.rb
View File

0
tests/flexnbd/constants.rb → tests/acceptance/flexnbd/constants.rb
View File

0
tests/flexnbd/fake_dest.rb → tests/acceptance/flexnbd/fake_dest.rb
View File

0
tests/flexnbd/fake_source.rb → tests/acceptance/flexnbd/fake_source.rb
View File

4
tests/nbd_scenarios → tests/acceptance/nbd_scenarios
View File

@@ -16,8 +16,8 @@ class Environment
@available_ports = [*40000..41000] - listening_ports @available_ports = [*40000..41000] - listening_ports
@port1 = @available_ports.shift @port1 = @available_ports.shift
@port2 = @available_ports.shift @port2 = @available_ports.shift
@nbd1 = FlexNBD.new("../build/flexnbd", @ip, @port1) @nbd1 = FlexNBD.new("../../build/flexnbd", @ip, @port1)
@nbd2 = FlexNBD.new("../build/flexnbd", @ip, @port2) @nbd2 = FlexNBD.new("../../build/flexnbd", @ip, @port2)
@fake_pid = nil @fake_pid = nil
end end

0
tests/test_file_writer.rb → tests/acceptance/test_file_writer.rb
View File