* test/thread/test_thread.rb: changed indent level to 2.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

test/thread/test_thread.rb

@@ -1,90 +1,89 @@
-# -*- ruby-indent-level: 4 -*-
 require 'thread'
 require 'test/unit'
 
 class TC_Thread < Test::Unit::TestCase
-    def setup
+  def setup
-	Thread.abort_on_exception = true
+    Thread.abort_on_exception = true
+  end
+  def teardown
+    Thread.abort_on_exception = false
+  end
+  def test_condvar
+    mutex = Mutex.new
+    condvar = ConditionVariable.new
+    result = []
+    mutex.synchronize do
+      t = Thread.new do
+        mutex.synchronize do
+          result << 1
+          condvar.signal
+        end
+      end
+      
+      result << 0
+      condvar.wait(mutex)
+      result << 2
+      t.join
     end
-    def teardown
+    assert_equal([0, 1, 2], result)
-	Thread.abort_on_exception = false
+  end
-    end
+
-    def test_condvar
+  def test_condvar_wait_not_owner
-	mutex = Mutex.new
+    mutex = Mutex.new
-	condvar = ConditionVariable.new
+    condvar = ConditionVariable.new
-	result = []
+
-	mutex.synchronize do
+    assert_raises(ThreadError) { condvar.wait(mutex) }
-	    t = Thread.new do
+  end
-		mutex.synchronize do
+
-		    result << 1
+  def test_condvar_wait_exception_handling
-		    condvar.signal
+    # Calling wait in the only thread running should raise a ThreadError of
-		end
+    # 'stopping only thread'
-	    end
+    mutex = Mutex.new
-	
+    condvar = ConditionVariable.new
-	    result << 0
+
-	    condvar.wait(mutex)
+    Thread.abort_on_exception = false
-	    result << 2
+
-	    t.join
+    locked = false
-	end
+    thread = Thread.new do
-	assert_equal([0, 1, 2], result)
+      mutex.synchronize do
+        begin
+          condvar.wait(mutex)
+        rescue Exception
+          locked = mutex.locked?
+          raise
+        end
+      end
     end
 
-    def test_condvar_wait_not_owner
+    while !thread.stop?
-	mutex = Mutex.new
+      sleep(0.1)
-	condvar = ConditionVariable.new
-
-	assert_raises(ThreadError) { condvar.wait(mutex) }
     end
 
-    def test_condvar_wait_exception_handling
+    thread.raise Interrupt, "interrupt a dead condition variable"
-	# Calling wait in the only thread running should raise a ThreadError of
+    assert_raises(Interrupt) { thread.value }
-	# 'stopping only thread'
+    assert(locked)
-	mutex = Mutex.new
+  end
-	condvar = ConditionVariable.new
 
-	Thread.abort_on_exception = false
+  def test_local_barrier
+    dir = File.dirname(__FILE__)
+    lbtest = File.join(dir, "lbtest.rb")
+    $:.unshift File.join(File.dirname(dir), 'ruby')
+    require 'envutil'
+    $:.shift
+    10.times {
+      result = `#{EnvUtil.rubybin} #{lbtest}`
+      assert(!$?.coredump?, '[ruby-dev:30653]')
+      assert_equal("exit.", result[/.*\Z/], '[ruby-dev:30653]')
+    }
+  end
 
-	locked = false
+  def test_queue_rescue
-	thread = Thread.new do
+    require "timeout"
-	    mutex.synchronize do
+    queue = Queue.new
-		begin
+    assert_raises(Timeout::Error) {Timeout.timeout(0.001) {queue.pop}}
-		    condvar.wait(mutex)
+    queue.push(1)
-		rescue Exception
+    assert_nothing_raised("[ruby-dev:37545]") {assert_equal(1, queue.pop)}
-		    locked = mutex.locked?
+    assert(queue.empty?)
-		    raise
+  end
-		end
-	    end
-	end
-
-	while !thread.stop?
-	    sleep(0.1)
-	end
-
-	thread.raise Interrupt, "interrupt a dead condition variable"
-	assert_raises(Interrupt) { thread.value }
-	assert(locked)
-    end
-
-    def test_local_barrier
-        dir = File.dirname(__FILE__)
-        lbtest = File.join(dir, "lbtest.rb")
-        $:.unshift File.join(File.dirname(dir), 'ruby')
-        require 'envutil'
-        $:.shift
-        10.times {
-            result = `#{EnvUtil.rubybin} #{lbtest}`
-            assert(!$?.coredump?, '[ruby-dev:30653]')
-            assert_equal("exit.", result[/.*\Z/], '[ruby-dev:30653]')
-        }
-    end
-
-    def test_queue_rescue
-        require "timeout"
-        queue = Queue.new
-        assert_raises(Timeout::Error) {Timeout.timeout(0.001) {queue.pop}}
-        queue.push(1)
-        assert_nothing_raised("[ruby-dev:37545]") {assert_equal(1, queue.pop)}
-        assert(queue.empty?)
-    end
 end