Merge pull request #12315 from gaurish/super

TypeError: superclass mismatch for class PostgreSQLAdapter
rails · Sep 23, 2013 · 9f1b43b · 9f1b43b
2 parents dd13722 + 2a6cb8a
commit 9f1b43b
Showing 1 changed file with 28 additions and 26 deletions.
diff --git a/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb b/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb
@@ -1,38 +1,40 @@
 require 'cases/helper'
 
-module ActiveRecord::ConnectionAdapters
+module ActiveRecord
-  class PostgreSQLAdapter < AbstractAdapter
+  module ConnectionAdapters
-    class InactivePGconn
+    class PostgreSQLAdapter < AbstractAdapter
-      def query(*args)
+      class InactivePGconn
-        raise PGError
+        def query(*args)
-      end
+          raise PGError
+        end
 
-      def status
+        def status
-        PGconn::CONNECTION_BAD
+          PGconn::CONNECTION_BAD
+        end
       end
-    end
 
-    class StatementPoolTest < ActiveRecord::TestCase
+      class StatementPoolTest < ActiveRecord::TestCase
-      def test_cache_is_per_pid
+        def test_cache_is_per_pid
-        return skip('must support fork') unless Process.respond_to?(:fork)
+          return skip('must support fork') unless Process.respond_to?(:fork)
 
-        cache = StatementPool.new nil, 10
+          cache = StatementPool.new nil, 10
-        cache['foo'] = 'bar'
+          cache['foo'] = 'bar'
-        assert_equal 'bar', cache['foo']
+          assert_equal 'bar', cache['foo']
 
-        pid = fork {
+          pid = fork {
-          lookup = cache['foo'];
+            lookup = cache['foo'];
-          exit!(!lookup)
+            exit!(!lookup)
-        }
+          }
 
-        Process.waitpid pid
+          Process.waitpid pid
-        assert $?.success?, 'process should exit successfully'
+          assert $?.success?, 'process should exit successfully'
-      end
+        end
 
-      def test_dealloc_does_not_raise_on_inactive_connection
+        def test_dealloc_does_not_raise_on_inactive_connection
-        cache = StatementPool.new InactivePGconn.new, 10
+          cache = StatementPool.new InactivePGconn.new, 10
-        cache['foo'] = 'bar'
+          cache['foo'] = 'bar'
-        assert_nothing_raised { cache.clear }
+          assert_nothing_raised { cache.clear }
+        end
       end
     end
   end