protobuffs_backends_spec.rb in riak-client-1.0.0.beta

- old
+ new

@@ -1,34 +1,10 @@
-# Copyright 2010 Sean Cribbs  and Basho Technologies, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-require File.expand_path("../../spec_helper", File.dirname(__FILE__))
+require 'spec_helper'
 
 describe "Protocol Buffers" do
-  before :all do
-    if $test_server
-      @pbc_port = 9002
-      $test_server.start
-    end
-  end
-
   before do
-    @pbc_port ||= 8087
+    @pbc_port ||= $test_server.pb_port
     @client = Riak::Client.new(:pb_port => @pbc_port, :protocol => "pbc")
-  end
-
-  after do
-    $test_server.recycle if $test_server.started?
   end
 
   [:BeefcakeProtobuffsBackend].each do |klass|
     bklass = Riak::Client.const_get(klass)
     if bklass.configured?