diff options
author | Ian Taylor <ian@lorf.org> | 2009-06-05 12:39:04 -0400 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2009-06-06 09:12:00 +1000 |
commit | 4f2c066a97e59a89df64af4b25beac6f3f0553c2 (patch) | |
tree | 126540beec3c65448e01e1b48d27275ec4ee6ea4 /test/network | |
parent | 97e6975d69f239e24993315a25a3117b1daa48c3 (diff) | |
download | puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.gz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.xz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.zip |
Removed extra whitespace from end of lines
Diffstat (limited to 'test/network')
-rwxr-xr-x | test/network/handler/bucket.rb | 4 | ||||
-rwxr-xr-x | test/network/handler/fileserver.rb | 28 | ||||
-rwxr-xr-x | test/network/server/webrick.rb | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/test/network/handler/bucket.rb b/test/network/handler/bucket.rb index 1a7063366..24e70cf01 100755 --- a/test/network/handler/bucket.rb +++ b/test/network/handler/bucket.rb @@ -106,7 +106,7 @@ class TestBucket < Test::Unit::TestCase end %w{ - who bash sh uname /etc/passwd /etc/syslog.conf /etc/hosts + who bash sh uname /etc/passwd /etc/syslog.conf /etc/hosts }.each { |file| # if it's fully qualified, just add it if file =~ /^\// @@ -251,7 +251,7 @@ class TestBucket < Test::Unit::TestCase dir = File.join(@bucket, dirs, md5) filedir, contents, paths = bucket.class.paths(@bucket, md5) - assert_equal(dir, filedir, "did not use a deeper file structure") + assert_equal(dir, filedir, "did not use a deeper file structure") assert_equal(File.join(dir, "contents"), contents, "content path is not the deeper version") assert_equal(File.join(dir, "paths"), paths, diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb index 47f848ed2..a6c678683 100755 --- a/test/network/handler/fileserver.rb +++ b/test/network/handler/fileserver.rb @@ -50,7 +50,7 @@ class TestFileServer < Test::Unit::TestCase File.open(name, "w") { |f| f.puts rand(100) } - + name } @@ -463,7 +463,7 @@ class TestFileServer < Test::Unit::TestCase File.open(conffile, "w") { |f| f.print "# a test config file - + [thing] path #{basedir}/thing allow 192.168.0.* @@ -481,7 +481,7 @@ class TestFileServer < Test::Unit::TestCase " } - + # create a server with the file assert_nothing_raised { @@ -593,7 +593,7 @@ class TestFileServer < Test::Unit::TestCase File.open(conffile, "w") { |f| f.print text } - + # create a server with the file server = nil @@ -614,7 +614,7 @@ class TestFileServer < Test::Unit::TestCase File.open(conffile, "w") { |f| f.print text } - + # create a server with the file server = nil @@ -638,13 +638,13 @@ class TestFileServer < Test::Unit::TestCase files = mktestfiles(dir) File.open(conffile, "w") { |f| f.print "# a test config file - + [thing] path #{dir} allow test1.domain.com " } - + # Reset the timeout, so we reload faster Puppet[:filetimeout] = 0.5 @@ -671,13 +671,13 @@ class TestFileServer < Test::Unit::TestCase sleep 1 File.open(conffile, "w") { |f| f.print "# a test config file - + [thing] path #{dir} allow test2.domain.com " } - + assert_raise(Puppet::AuthorizationError, "List allowed invalid host") { list = server.list("/thing/", :manage, false, false, "test1.domain.com", "127.0.0.1") @@ -773,12 +773,12 @@ class TestFileServer < Test::Unit::TestCase client1_hostdir => "client1\n", client2_fqdndir => client2 + "\n" } - [fsdir, hostdir, fqdndir, + [fsdir, hostdir, fqdndir, client1_hostdir, client2_fqdndir].each { |d| Dir.mkdir(d) } - + [client1_hostdir, client2_fqdndir].each do |d| - File.open(File.join(d, "file.txt"), "w") do |f| - f.print contents[d] + File.open(File.join(d, "file.txt"), "w") do |f| + f.print contents[d] end end conffile = tempfile() @@ -946,7 +946,7 @@ allow * result = check.call(client, pat, repl) end - # Now, check that they use Facter info + # Now, check that they use Facter info Puppet.notice "The following messages are normal" client = nil Facter.stubs(:value).with(:ipaddress).returns("127.0.0.1") diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb index 8b637c39f..5a930848d 100755 --- a/test/network/server/webrick.rb +++ b/test/network/server/webrick.rb @@ -65,7 +65,7 @@ class TestWebrickServer < Test::Unit::TestCase } assert_equal(1, retval) end - + def mk_status_client client = nil |