summaryrefslogtreecommitdiff
path: root/test/soap
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-08 15:09:49 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-08 15:09:49 +0000
commitaf2dc0030084bc68355ea4ff2d599be311480249 (patch)
treef16c5da9f71ed9f80d97b97a114a8c24a57ed8a1 /test/soap
parente67e930462b781f09e412e161c4ed8515640bdb2 (diff)
* lib/soap/rpc/standaloneServer.rb: add 'shutdown' and 'status'
methods as delegates to WEBrick. * test/soap/calc/{test_calc.rb,test_calc2.rb}, test/soap/helloworld/test_helloworld.rb, test/wsdl/datetime/test_datetime.rb, test/wsdl/raa/test_raa.rb: follow the change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/soap')
-rw-r--r--test/soap/calc/test_calc.rb4
-rw-r--r--test/soap/calc/test_calc2.rb4
-rw-r--r--test/soap/helloworld/test_helloworld.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb
index d73ade4..c917ddc 100644
--- a/test/soap/calc/test_calc.rb
+++ b/test/soap/calc/test_calc.rb
@@ -20,7 +20,7 @@ class TestCalc < Test::Unit::TestCase
@t = Thread.new {
@server.start
}
- while @server.server.nil? or @server.server.status != :Running
+ while @server.status != :Running
sleep 0.1
unless @t.alive?
@t.join
@@ -36,7 +36,7 @@ class TestCalc < Test::Unit::TestCase
end
def teardown
- @server.server.shutdown
+ @server.shutdown
@t.kill
@t.join
@calc.reset_stream
diff --git a/test/soap/calc/test_calc2.rb b/test/soap/calc/test_calc2.rb
index 1f18a5f..b7fee71 100644
--- a/test/soap/calc/test_calc2.rb
+++ b/test/soap/calc/test_calc2.rb
@@ -21,7 +21,7 @@ class TestCalc2 < Test::Unit::TestCase
Thread.current.abort_on_exception = true
@server.start
}
- while @server.server.nil? or @server.server.status != :Running
+ while @server.status != :Running
sleep 0.1
unless @t.alive?
@t.join
@@ -39,7 +39,7 @@ class TestCalc2 < Test::Unit::TestCase
end
def teardown
- @server.server.shutdown
+ @server.shutdown
@t.kill
@t.join
@var.reset_stream
diff --git a/test/soap/helloworld/test_helloworld.rb b/test/soap/helloworld/test_helloworld.rb
index 1e9c4a3..7261e42 100644
--- a/test/soap/helloworld/test_helloworld.rb
+++ b/test/soap/helloworld/test_helloworld.rb
@@ -21,7 +21,7 @@ class TestHelloWorld < Test::Unit::TestCase
Thread.current.abort_on_exception = true
@server.start
}
- while @server.server.nil? or @server.server.status != :Running
+ while @server.status != :Running
sleep 0.1
unless @t.alive?
@t.join
@@ -34,7 +34,7 @@ class TestHelloWorld < Test::Unit::TestCase
end
def teardown
- @server.server.shutdown
+ @server.shutdown
@t.kill
@t.join
@client.reset_stream