diff options
| author | Bryan Duxbury <bryanduxbury@apache.org> | 2009-03-26 18:41:44 +0000 |
|---|---|---|
| committer | Bryan Duxbury <bryanduxbury@apache.org> | 2009-03-26 18:41:44 +0000 |
| commit | 8852720e70e77669fa5ffff494dd641f6fff06f2 (patch) | |
| tree | 960f0dd2a22e76af135b4cf10ff3b0217ffa638a /lib/rb/spec | |
| parent | e211393964cc1083ec0cc11d3ccf6f1666bfd521 (diff) | |
| download | thrift-8852720e70e77669fa5ffff494dd641f6fff06f2.tar.gz | |
THRIFT-372. rb: Ruby lib doesn't rescue properly from lack of native_thrift extension
This patch adds a new thrift/thrift_native.rb which should be the require point for application users. It also removes some unnecessary code from a few files and cleans up requires in some specs.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@758794 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'lib/rb/spec')
| -rw-r--r-- | lib/rb/spec/protocol_spec.rb | 1 | ||||
| -rw-r--r-- | lib/rb/spec/spec_helper.rb | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/lib/rb/spec/protocol_spec.rb b/lib/rb/spec/protocol_spec.rb index 1db4e19fc..443c8f09d 100644 --- a/lib/rb/spec/protocol_spec.rb +++ b/lib/rb/spec/protocol_spec.rb @@ -1,5 +1,4 @@ require File.dirname(__FILE__) + '/spec_helper' -require "thrift_native" class ThriftProtocolSpec < Spec::ExampleGroup include Thrift diff --git a/lib/rb/spec/spec_helper.rb b/lib/rb/spec/spec_helper.rb index 30b9da701..3fbd673f1 100644 --- a/lib/rb/spec/spec_helper.rb +++ b/lib/rb/spec/spec_helper.rb @@ -9,13 +9,6 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. ext]) # will get screwed up # $" << 'fastthread.bundle' -# turn on deprecation so we can test it -module Thrift - # squelch any warnings if we happen to get required twice - remove_const(:DEPRECATION) if const_defined? :DEPRECATION - DEPRECATION = true -end - require File.dirname(__FILE__) + '/../lib/thrift' class Object @@ -32,9 +25,6 @@ Spec::Runner.configure do |configuration| end end -require "thrift/protocol/compact_protocol" -require "thrift_native" - require File.dirname(__FILE__) + "/../debug_proto_test/gen-rb/Srv" module Fixtures |