Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8437e3f

Browse files
committed
Hacked tests to work with Ruby 1.8.7 and FUSE 2.8 again.
The test suite now passes under Ubuntu 12.04 and CentOS 6.Fixesmpartel#49
1 parent040989a commit8437e3f

File tree

7 files changed

+133
-52
lines changed

7 files changed

+133
-52
lines changed

‎ChangeLog‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2017-03-12 Martin Pärtel <martin dot partel at gmail dot com>
2+
3+
* Made tests work with Ruby 1.8.7 and FUSE 2.8 again (issue #49).
4+
15
2017-02-04 Martin Pärtel <martin dot partel at gmail dot com>
26

37
* Deprecated -n as an alias to --no-allow-other (issue #48).

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ The test suite has two kinds of tests: those that have to be run as root and
5656
those that have to be run as non-root. To run all of the tests, do
5757
`make check` both as root and as non-root.
5858

59-
The test suite requires Ruby2.0+ (1.9+ might also work). If you're using
60-
[RVM](https://rvm.io/)then you may need to use`rvmsudo` instead of plain
61-
`sudo` to run the roottests.
59+
The test suite requires Ruby1.8.7+. If you're using[RVM](https://rvm.io/)
60+
then you may need to use`rvmsudo` instead of plain`sudo` to run the root
61+
tests.
6262

6363

6464
##License ##

‎tests/common.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
# along with bindfs. If not, see <http://www.gnu.org/licenses/>.
1919
#
2020

21+
require'ruby18_hacks.rb'
22+
require'shellwords'unless $ruby_18_hacks_enabled# Ruby 1.8 doesn't have shellwords
2123
require'fileutils'
22-
require'shellwords'
2324
includeFileUtils
2425

2526
# Set the default umask for all tests

‎tests/ruby18_hacks.rb‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Backwards-compatibility hacks for old systems running Ruby 1.8
2+
3+
$ruby_18_hacks_enabled=(RUBY_VERSION =~/1\.8\..*/)
4+
5+
if $ruby_18_hacks_enabled
6+
require'fileutils'
7+
require'pathname'
8+
9+
moduleFileUtils
10+
alias_method:original_chmod,:chmod
11+
defchmod(perms,path)
12+
ifperms.is_a?(String)
13+
system("chmod " +Shellwords.escape(perms) +" " +Shellwords.escape(path))
14+
else
15+
original_chmod(perms,path)
16+
end
17+
end
18+
end
19+
20+
classFile
21+
defself.realpath(path)
22+
Pathname.new(path).realpath.to_s
23+
end
24+
25+
defself.write(path,contents)
26+
File.open(path,"wb")do |f|
27+
f.write(contents)
28+
end
29+
end
30+
end
31+
32+
moduleShellwords
33+
# Copied from http://svn.ruby-lang.org/repos/ruby/trunk/lib/shellwords.rb (GPLv2)
34+
# on 2017-03-11
35+
defself.escape(str)
36+
str=str.to_s
37+
38+
# An empty argument will be skipped, so return empty quotes.
39+
return"''".dupifstr.empty?
40+
41+
str=str.dup
42+
43+
# Treat multibyte characters as is. It is the caller's responsibility
44+
# to encode the string in the right encoding for the shell
45+
# environment.
46+
str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/,"\\\\\\1")
47+
48+
# A LF cannot be escaped with a backslash because a backslash + LF
49+
# combo is regarded as a line continuation and simply ignored.
50+
str.gsub!(/\n/,"'\n'")
51+
52+
returnstr
53+
end
54+
end
55+
end

‎tests/stress_test.rb‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env ruby
22

3-
require'./common.rb'
3+
# if we are being run by make check it will set srcdir and we should use it
4+
$LOAD_PATH <<(ENV['srcdir'] ||'.')
5+
require'common.rb'
46
require'shellwords'
57

68
ifARGV.length ==0 ||['-h','--help'].include?(ARGV[0])

‎tests/test_bindfs.rb‎

Lines changed: 62 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,20 @@
1919
#
2020

2121
# if we are being run by make check it will set srcdir and we should use it
22-
localsrc_path=ENV['srcdir'] ||'.'
22+
$LOAD_PATH <<(ENV['srcdir'] ||'.')
2323

24-
requirelocalsrc_path +'/common.rb'
24+
require'common.rb'
2525

2626
includeErrno
2727

28+
$have_fuse_29=Proc.newdo
29+
v=`pkg-config --modversion fuse`.split('.')
30+
raise"failed to get FUSE version with pkg-config"ifv.size <2
31+
v=v.map(&:to_i)
32+
v=[2,8,0]
33+
v[0] >2 ||(v[0] ==2 &&v[1] >=9)
34+
end.call
35+
2836
# FileUtils.chown turned out to be quite buggy in Ruby 1.8.7,
2937
# so we'll use File.chown instead.
3038
defchown(user,group,list)
@@ -619,62 +627,70 @@ def run_chown_chgrp_test_case(chown_flag, chgrp_flag, expectations)
619627
assert{Dir.entries('mnt/dir').sort ==expected_entries.sort}
620628
end
621629

622-
testenv("--enable-lock-forwarding --multithreaded",:title=>"lock forwarding")do
623-
File.write('src/file','some contents for fcntl lockng')
624-
# (this test passes with an empty file as well, but this way is clearer)
630+
if $have_fuse_29
631+
testenv("--enable-lock-forwarding --multithreaded",:title=>"lock forwarding")do
632+
File.write('src/file','some contents for fcntl lockng')
633+
# (this test passes with an empty file as well, but this way is clearer)
625634

626-
# flock
627-
File.open('mnt/file')do |f1|
628-
File.open('src/file')do |f2|
629-
assert{f1.flock(File::LOCK_EX |File::LOCK_NB)}
630-
assert{ !f2.flock(File::LOCK_EX |File::LOCK_NB)}
631-
assert{f1.flock(File::LOCK_UN)}
635+
# flock
636+
File.open('mnt/file')do |f1|
637+
File.open('src/file')do |f2|
638+
assert{f1.flock(File::LOCK_EX |File::LOCK_NB)}
639+
assert{ !f2.flock(File::LOCK_EX |File::LOCK_NB)}
640+
assert{f1.flock(File::LOCK_UN)}
632641

633-
assert{f2.flock(File::LOCK_EX |File::LOCK_NB)}
634-
assert{ !f1.flock(File::LOCK_EX |File::LOCK_NB)}
642+
assert{f2.flock(File::LOCK_EX |File::LOCK_NB)}
643+
assert{ !f1.flock(File::LOCK_EX |File::LOCK_NB)}
644+
end
645+
assert{f1.flock(File::LOCK_EX |File::LOCK_NB)}
635646
end
636-
assert{f1.flock(File::LOCK_EX |File::LOCK_NB)}
637-
end
638647

639-
# fcntl locking
640-
system("#{$tests_dir}/fcntl_locker src/file mnt/file")
641-
raise"fcntl lock sharing test failed"unless $?.success?
642-
end
648+
# fcntl locking
649+
system("#{$tests_dir}/fcntl_locker src/file mnt/file")
650+
raise"fcntl lock sharing test failed"unless $?.success?
651+
end
643652

644-
testenv("--disable-lock-forwarding",:title=>"no lock forwarding")do
645-
File.write('src/file','some contents for fcntl lockng')
653+
testenv("--disable-lock-forwarding",:title=>"no lock forwarding")do
654+
File.write('src/file','some contents for fcntl lockng')
646655

647-
# flock
648-
File.open('mnt/file')do |f1|
649-
File.open('src/file')do |f2|
650-
assert{f1.flock(File::LOCK_EX |File::LOCK_NB)}
651-
assert{f2.flock(File::LOCK_EX |File::LOCK_NB)}
652-
end
653-
File.open('mnt/file')do |f2|
654-
assert{ !f2.flock(File::LOCK_EX |File::LOCK_NB)}
656+
# flock
657+
File.open('mnt/file')do |f1|
658+
File.open('src/file')do |f2|
659+
assert{f1.flock(File::LOCK_EX |File::LOCK_NB)}
660+
assert{f2.flock(File::LOCK_EX |File::LOCK_NB)}
661+
end
662+
File.open('mnt/file')do |f2|
663+
assert{ !f2.flock(File::LOCK_EX |File::LOCK_NB)}
664+
end
655665
end
656-
end
657666

658-
# fcntl locking
659-
system("#{$tests_dir}/fcntl_locker src/file mnt/file")
660-
raise"fcntl lock sharing test failed"unless $?.exitstatus ==1
661-
end
667+
# fcntl locking
668+
system("#{$tests_dir}/fcntl_locker src/file mnt/file")
669+
raise"fcntl lock sharing test failed"unless $?.exitstatus ==1
670+
end
671+
end# have_fuse_29
662672

663673
# Issue #37
664-
# Valgrind disabled for ioctl tests since it seems to give a false negative
674+
#
675+
# Valgrind is disabled for ioctl tests since it seems to give a false negative
665676
# about a null parameter to ioctl.
666-
root_testenv("--enable-ioctl",:title=>"append-only ioctl",:valgrind=>false)do
667-
touch('mnt/file')
668-
system('chattr +a mnt/file')
669-
raise'chattr +a failed'unless $?.success?
670-
begin
671-
File.open('mnt/file','a')do |f|
672-
f.write('stuff')
677+
#
678+
# This test is also disabled for old (FUSE < 2.9) systems.
679+
# TODO: figure out why it doesn't work.
680+
if $have_fuse_29
681+
root_testenv("--enable-ioctl",:title=>"append-only ioctl",:valgrind=>false)do
682+
touch('mnt/file')
683+
system('chattr +a mnt/file')
684+
raise'chattr +a failed'unless $?.success?
685+
begin
686+
File.open('mnt/file','a')do |f|
687+
f.write('stuff')
688+
end
689+
assert{File.read('mnt/file') =='stuff'}
690+
assert_exception(EPERM){File.write('mnt/file','newstuff')}
691+
ensure
692+
system('chattr -a mnt/file')
673693
end
674-
assert{File.read('mnt/file') =='stuff'}
675-
assert_exception(EPERM){File.write('mnt/file','newstuff')}
676-
ensure
677-
system('chattr -a mnt/file')
678694
end
679695
end
680696

‎tests/test_concurrent.rb‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
# You should have received a copy of the GNU General Public License
1818
# along with bindfs. If not, see <http://www.gnu.org/licenses/>.
1919
#
20-
require'./common.rb'
20+
21+
# if we are being run by make check it will set srcdir and we should use it
22+
$LOAD_PATH <<(ENV['srcdir'] ||'.')
23+
require'common.rb'
2124

2225
raise"Please run this as root"unlessProcess.uid ==0
2326

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp