You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2011/11/10 01:53:18 UTC
svn commit: r1200070 - /thrift/trunk/lib/rb/spec/
Author: jfarrell
Date: Thu Nov 10 00:53:17 2011
New Revision: 1200070
URL: http://svn.apache.org/viewvc?rev=1200070&view=rev
Log:
Thrift-1424:Ruby specs fail when run with rake
Client: ruby
Patch: Peter Sanford
Fixes specs failing to load the spec_helper in ruby 1.9.2
Modified:
thrift/trunk/lib/rb/spec/base_protocol_spec.rb
thrift/trunk/lib/rb/spec/base_transport_spec.rb
thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb
thrift/trunk/lib/rb/spec/binary_protocol_spec.rb
thrift/trunk/lib/rb/spec/binary_protocol_spec_shared.rb
thrift/trunk/lib/rb/spec/client_spec.rb
thrift/trunk/lib/rb/spec/compact_protocol_spec.rb
thrift/trunk/lib/rb/spec/exception_spec.rb
thrift/trunk/lib/rb/spec/http_client_spec.rb
thrift/trunk/lib/rb/spec/mongrel_http_server_spec.rb
thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb
thrift/trunk/lib/rb/spec/processor_spec.rb
thrift/trunk/lib/rb/spec/serializer_spec.rb
thrift/trunk/lib/rb/spec/server_socket_spec.rb
thrift/trunk/lib/rb/spec/server_spec.rb
thrift/trunk/lib/rb/spec/socket_spec.rb
thrift/trunk/lib/rb/spec/socket_spec_shared.rb
thrift/trunk/lib/rb/spec/struct_spec.rb
thrift/trunk/lib/rb/spec/types_spec.rb
thrift/trunk/lib/rb/spec/union_spec.rb
thrift/trunk/lib/rb/spec/unix_socket_spec.rb
Modified: thrift/trunk/lib/rb/spec/base_protocol_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/base_protocol_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/base_protocol_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/base_protocol_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftBaseProtocolSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/base_transport_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/base_transport_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/base_transport_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/base_transport_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftBaseTransportSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,8 +17,8 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/binary_protocol_spec_shared'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/binary_protocol_spec_shared")
if defined? Thrift::BinaryProtocolAccelerated
Modified: thrift/trunk/lib/rb/spec/binary_protocol_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/binary_protocol_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/binary_protocol_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/binary_protocol_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,8 +17,8 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/binary_protocol_spec_shared'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/binary_protocol_spec_shared")
class ThriftBinaryProtocolSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/binary_protocol_spec_shared.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/binary_protocol_spec_shared.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/binary_protocol_spec_shared.rb (original)
+++ thrift/trunk/lib/rb/spec/binary_protocol_spec_shared.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
shared_examples_for 'a binary protocol' do
before(:each) do
Modified: thrift/trunk/lib/rb/spec/client_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/client_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/client_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/client_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftClientSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/compact_protocol_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/compact_protocol_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/compact_protocol_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/compact_protocol_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
describe Thrift::CompactProtocol do
TESTS = {
Modified: thrift/trunk/lib/rb/spec/exception_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/exception_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/exception_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/exception_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftExceptionSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/http_client_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/http_client_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/http_client_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/http_client_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftHTTPClientTransportSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/mongrel_http_server_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/mongrel_http_server_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/mongrel_http_server_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/mongrel_http_server_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
require 'thrift/server/mongrel_http_server'
class ThriftHTTPServerSpec < Spec::ExampleGroup
Modified: thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftNonblockingServerSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/processor_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/processor_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/processor_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/processor_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftProcessorSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/serializer_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/serializer_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/serializer_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/serializer_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftSerializerSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/server_socket_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/server_socket_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/server_socket_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/server_socket_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,8 +17,8 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/socket_spec_shared"
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
class ThriftServerSocketSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/server_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/server_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/server_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/server_spec.rb Thu Nov 10 00:53:17 2011
@@ -16,8 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftServerSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/socket_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/socket_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/socket_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/socket_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,8 +17,8 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/socket_spec_shared"
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
class ThriftSocketSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/socket_spec_shared.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/socket_spec_shared.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/socket_spec_shared.rb (original)
+++ thrift/trunk/lib/rb/spec/socket_spec_shared.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
shared_examples_for "a socket" do
it "should open a socket" do
Modified: thrift/trunk/lib/rb/spec/struct_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/struct_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/struct_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/struct_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftStructSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/types_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/types_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/types_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/types_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftTypesSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/union_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/union_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/union_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/union_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,7 +17,7 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
class ThriftUnionSpec < Spec::ExampleGroup
include Thrift
Modified: thrift/trunk/lib/rb/spec/unix_socket_spec.rb
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/spec/unix_socket_spec.rb?rev=1200070&r1=1200069&r2=1200070&view=diff
==============================================================================
--- thrift/trunk/lib/rb/spec/unix_socket_spec.rb (original)
+++ thrift/trunk/lib/rb/spec/unix_socket_spec.rb Thu Nov 10 00:53:17 2011
@@ -17,8 +17,8 @@
# under the License.
#
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/socket_spec_shared"
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
class ThriftUNIXSocketSpec < Spec::ExampleGroup
include Thrift