summaryrefslogtreecommitdiffstats
path: root/test/network
diff options
context:
space:
mode:
authorIan Taylor <ian@lorf.org>2009-06-05 12:38:35 -0400
committerJames Turnbull <james@lovedthanlost.net>2009-06-06 09:11:28 +1000
commit41ce18cc8ea239d1633fc6cd9e9f599957a82e74 (patch)
tree9d398b4e3e6d726a174b5b57094c7dd6749ccf0e /test/network
parentf3b40923605420f774dac298fb1708de180c0a81 (diff)
downloadpuppet-41ce18cc8ea239d1633fc6cd9e9f599957a82e74.tar.gz
puppet-41ce18cc8ea239d1633fc6cd9e9f599957a82e74.tar.xz
puppet-41ce18cc8ea239d1633fc6cd9e9f599957a82e74.zip
Changed tabs to spaces without interfering with indentation or alignment
Diffstat (limited to 'test/network')
-rwxr-xr-xtest/network/authconfig.rb2
-rwxr-xr-xtest/network/authorization.rb2
-rwxr-xr-xtest/network/authstore.rb30
-rwxr-xr-xtest/network/client_request.rb2
-rwxr-xr-xtest/network/handler/fileserver.rb2
-rwxr-xr-xtest/network/handler/report.rb6
-rwxr-xr-xtest/network/handler/runner.rb2
-rwxr-xr-xtest/network/rights.rb2
-rwxr-xr-xtest/network/xmlrpc/webrick_servlet.rb10
9 files changed, 29 insertions, 29 deletions
diff --git a/test/network/authconfig.rb b/test/network/authconfig.rb
index 3a05096d5..b619bec7e 100755
--- a/test/network/authconfig.rb
+++ b/test/network/authconfig.rb
@@ -7,7 +7,7 @@ require 'puppettest'
require 'puppet/network/authconfig'
class TestAuthConfig < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def request(call, client, ip)
r = Puppet::Network::ClientRequest.new(client, ip, false)
diff --git a/test/network/authorization.rb b/test/network/authorization.rb
index 23ec8f95c..3ee10a4a8 100755
--- a/test/network/authorization.rb
+++ b/test/network/authorization.rb
@@ -7,7 +7,7 @@ require 'puppet/network/authorization'
require 'mocha'
class TestAuthConfig < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
# A mock class for authconfig
class FakeAuth
diff --git a/test/network/authstore.rb b/test/network/authstore.rb
index 587f39627..7a793afe5 100755
--- a/test/network/authstore.rb
+++ b/test/network/authstore.rb
@@ -7,7 +7,7 @@ require 'mocha'
require 'puppet/network/authstore'
class TestAuthStore < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
Declaration = Puppet::Network::AuthStore::Declaration
def mkstore
store = nil
@@ -124,7 +124,7 @@ class TestAuthStore < Test::Unit::TestCase
%w{hostname.com 192.168.0.4},
%w{localhost 192.168.0.1},
%w{localhost 127.0.0.1}
-
+
].each { |ary|
assert(@store.allowed?(*ary), "Failed to allow %s" % [ary.join(",")])
}
@@ -136,7 +136,7 @@ class TestAuthStore < Test::Unit::TestCase
"store did not return nil")
end
assert_equal([Declaration.new(:allow, "*.host.com")],
- @store.send(:instance_variable_get, "@declarations"),
+ @store.send(:instance_variable_get, "@declarations"),
"Did not store declaration")
# Now add another one and make sure it gets sorted appropriately
@@ -146,8 +146,8 @@ class TestAuthStore < Test::Unit::TestCase
end
assert_equal([
- Declaration.new(:allow, "me.host.com"),
- Declaration.new(:allow, "*.host.com")
+ Declaration.new(:allow, "me.host.com"),
+ Declaration.new(:allow, "*.host.com")
],
@store.send(:instance_variable_get, "@declarations"),
"Did not sort declarations")
@@ -189,7 +189,7 @@ class TestAuthStore < Test::Unit::TestCase
invalid
^invalid!
inval$id
-
+
}.each { |pat|
assert_raise(Puppet::AuthStoreError,
"name '%s' was allowed" % pat) {
@@ -298,14 +298,14 @@ class TestAuthStore < Test::Unit::TestCase
9.times { |a|
threads << Thread.new {
9.times { |b|
- Thread.pass
- @store.interpolate([nil, "a#{b}", "madstop.com"])
- Thread.pass
- assert( @store.allowed?("a#{b}.madstop.com", "192.168.0.1") )
- Thread.pass
- @store.reset_interpolation
- Thread.pass
- }
+ Thread.pass
+ @store.interpolate([nil, "a#{b}", "madstop.com"])
+ Thread.pass
+ assert( @store.allowed?("a#{b}.madstop.com", "192.168.0.1") )
+ Thread.pass
+ @store.reset_interpolation
+ Thread.pass
+ }
}
}
threads.each { |th| th.join }
@@ -314,7 +314,7 @@ class TestAuthStore < Test::Unit::TestCase
end
class TestAuthStoreDeclaration < PuppetTest::TestCase
- include PuppetTest
+ include PuppetTest
Declaration = Puppet::Network::AuthStore::Declaration
def setup
diff --git a/test/network/client_request.rb b/test/network/client_request.rb
index 7408e2b87..3a35706be 100755
--- a/test/network/client_request.rb
+++ b/test/network/client_request.rb
@@ -7,7 +7,7 @@ require 'puppettest'
require 'puppet/network/client_request'
class TestClientRequest < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def test_initialize
req = nil
diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index 5158f51ca..47f848ed2 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'puppet/network/handler/fileserver'
class TestFileServer < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def mkmount(path = nil)
mount = nil
diff --git a/test/network/handler/report.rb b/test/network/handler/report.rb
index 8719c68b5..914f03450 100755
--- a/test/network/handler/report.rb
+++ b/test/network/handler/report.rb
@@ -7,11 +7,11 @@ require 'puppet/network/handler/report'
require 'puppettest/reporttesting'
class TestReportServer < Test::Unit::TestCase
- include PuppetTest
- include PuppetTest::Reporttesting
+ include PuppetTest
+ include PuppetTest::Reporttesting
Report = Puppet::Network::Handler.report
- Puppet::Util.logmethods(self)
+ Puppet::Util.logmethods(self)
def mkserver
server = nil
diff --git a/test/network/handler/runner.rb b/test/network/handler/runner.rb
index 71d86fd9d..23cff83ff 100755
--- a/test/network/handler/runner.rb
+++ b/test/network/handler/runner.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'puppet/network/handler/runner'
class TestHandlerRunner < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def test_it_calls_agent_runner
runner = mock 'runner'
diff --git a/test/network/rights.rb b/test/network/rights.rb
index e1d9f8a0a..71b8c3765 100755
--- a/test/network/rights.rb
+++ b/test/network/rights.rb
@@ -6,7 +6,7 @@ require 'puppettest'
require 'puppet/network/rights'
class TestRights < Test::Unit::TestCase
- include PuppetTest
+ include PuppetTest
def setup
super
diff --git a/test/network/xmlrpc/webrick_servlet.rb b/test/network/xmlrpc/webrick_servlet.rb
index 74326f6a0..1d83d36ad 100755
--- a/test/network/xmlrpc/webrick_servlet.rb
+++ b/test/network/xmlrpc/webrick_servlet.rb
@@ -10,11 +10,11 @@ require 'mocha'
class TestXMLRPCWEBrickServlet < Test::Unit::TestCase
include PuppetTest
def test_basics
- # Make sure we're doing things as our user info, rather than puppet/puppet
- setme
- set_mygroup
- Puppet[:user] = @me
- Puppet[:group] = @mygroup
+ # Make sure we're doing things as our user info, rather than puppet/puppet
+ setme
+ set_mygroup
+ Puppet[:user] = @me
+ Puppet[:group] = @mygroup
servlet = nil
ca = Puppet::Network::Handler.ca.new