riak-client 0.9.8 → 1.0.0.beta

data/spec/integration/riak/node_spec.rb

@@ -0,0 +1,184 @@
+require 'spec_helper'
+require 'riak/node'
+require 'yaml'
+
+describe Riak::Node, :test_server => false, :slow => true do
+  let(:test_server_config){ YAML.load_file("spec/support/test_server.yml") }
+  subject { described_class.new(:root => ".ripplenode", :source => test_server_config['source']) }
+  after { subject.stop if subject.started? }
+  after(:all) { subject.destroy }
+
+  context "creation" do
+    before { subject.create }
+    after { subject.destroy }
+
+    describe "finding the base_dir and version" do
+      it "should return a valid directory for base_dir" do
+        subject.base_dir.should be_exist
+      end
+
+      it "should read a version from the releases directory" do
+        subject.version.should match /\d+.\d+.\d+/
+      end
+
+      it "should return nil for base_dir if RUNNER_BASE_DIR is not found" do
+        Pathname.any_instance.stub(:readlines).and_return([])
+        subject.base_dir.should be_nil
+      end
+
+      it "should return nil for version if base_dir is nil" do
+        Pathname.any_instance.stub(:readlines).and_return([])
+        subject.version.should be_nil
+      end
+    end
+
+    describe "generating the manifest" do
+      it "should store the configuration manifest in the node directory" do
+        (subject.root + '.node.yml').should be_exist
+      end
+    end
+
+    describe "generating app.config" do
+      let(:file) { subject.etc + 'app.config'}
+      let(:contents) { file.read }
+
+      it "should create the app.config file in the node directory" do
+        file.should be_exist
+      end
+
+      it "should generate a correct Erlang configuration" do
+        contents.should =~ /\A\[.*\]\.\Z/m
+      end
+
+      it "should set the ports starting from the given port" do
+        contents.should include('{http, [{"127.0.0.1", 8080}]}')
+        contents.should include('{pb_port, 8081}')
+        contents.should include('{handoff_port, 8082}')
+      end
+
+      it "should set the ring directory to point to the node directory" do
+        contents.should include("{ring_state_dir, \"#{subject.root + 'ring'}\"}")
+      end
+    end
+
+    describe "generating vm.args" do
+      let(:file){ subject.etc + 'vm.args' }
+      let(:contents) { file.read }
+
+      it "should create the vm.args file in the node directory" do
+        file.should be_exist
+      end
+
+      it "should set a quasi-random node name by default" do
+        contents.should match(/-name riak\d+@127\.0\.0\.1/)
+      end
+
+      it "should set a quasi-random cookie by default" do
+        contents.should match(/-setcookie \d+_\d+/)
+      end
+    end
+
+    describe "generating the start script" do
+      let(:file) { subject.control_script }
+      let(:contents) { file.read }
+
+      it "should create the script in the node directory" do
+        file.should be_exist
+      end
+
+      it "should modify the RUNNER_SCRIPT_DIR to point to the node directory" do
+        contents.should match(/RUNNER_SCRIPT_DIR=#{subject.bin.to_s}/)
+      end
+
+      it "should modify the RUNNER_ETC_DIR to point to the node directory" do
+        contents.should match(/RUNNER_ETC_DIR=#{subject.etc.to_s}/)
+      end
+
+      it "should modify the RUNNER_USER to point to none" do
+        contents.should match(/RUNNER_USER=$/)
+      end
+
+      it "should modify the RUNNER_LOG_DIR to point to the node directory" do
+        contents.should match(/RUNNER_LOG_DIR=#{subject.log.to_s}/)
+      end
+
+      it "should modify the RUNNER_BASE_DIR so that it is not relative" do
+        contents.should_not match(/RUNNER_BASE_DIR=\$\{RUNNER_SCRIPT_DIR%\/\*\}/)
+        contents.should match(/RUNNER_BASE_DIR=(.*)/) do |path|
+          path.strip.should == subject.root.to_s
+        end
+      end
+
+      it "should modify the PIPE_DIR to point to the node directory" do
+        contents.should match(/PIPE_DIR=#{subject.pipe.to_s}\/?/)
+      end
+    end
+  end
+
+  context "destroying" do
+    before { subject.create; subject.destroy }
+
+    it "should remove the node directory and all its contents" do
+      subject.root.should_not be_exist
+    end
+  end
+
+  context "dropping data" do
+    before do
+      subject.create
+      subject.start # Make it create some data directories
+      subject.with_console do |console|
+        # Write a ringfile
+        console.command "riak_core_ring_manager:write_ringfile()."
+      end
+      # Don't restart the node after dropping so we can see the handiwork
+      subject.stop
+      subject.drop
+    end
+
+    it "should remove all data from the node" do
+      (subject.root + 'data').children.map {|dir| dir.children }.flatten.should be_empty
+    end
+
+    it "should not remove the ring" do
+      (subject.root + 'ring').children.should_not be_empty
+    end
+  end
+
+  context "starting" do
+    before { subject.create; subject.start }
+    it { should be_started }
+    after { subject.stop }
+  end
+
+  context "stopping" do
+    before { subject.create; subject.start; subject.stop }
+    it { should be_stopped }
+  end
+
+  context "attaching" do
+    before { subject.create; subject.start }
+
+    it "should attach to the running node" do
+      console = subject.attach
+      console.should be_kind_of(Riak::Node::Console)
+      expect {
+        console.command "ok."
+        console.close
+      }.should_not raise_error
+    end
+  end
+
+  context "running" do
+    before { subject.create; subject.start; subject.stop }
+
+    it "should read the console log" do
+      if subject.version >= "1.0.0"
+        subject.read_console_log(:debug, :info, :notice).should_not be_empty
+        subject.read_console_log(:debug..:emergency).should_not be_empty
+        subject.read_console_log(:info).should_not be_empty
+        subject.read_console_log(:foo).should be_empty
+      end
+    end
+  end
+end

data/spec/integration/riak/protobuffs_backends_spec.rb

@@ -1,35 +1,11 @@
-# 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?

data/spec/integration/riak/test_server_spec.rb

@@ -1,174 +1,38 @@
-# Copyright 2010 Sean Cribbs, Sonian Inc., 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'
+require 'riak/test_server'
 
-if $test_server
-  describe Riak::TestServer do
-    before do
-      @server = $test_server
-    end
+describe Riak::TestServer do
+  subject { $test_server }
+  let(:app_config) { (subject.etc + 'app.config').read }
 
-    after do
-      @server.stop
-      @server.cleanup
-    end
-
-    describe "isolation from and modification of the existing install" do
-      before do
-        @server.prepare!
-        @riak_bin    = "#{@server.temp_dir}/bin/riak"
-        @vm_args     = "#{@server.temp_dir}/etc/vm.args"
-        @app_config  = "#{@server.temp_dir}/etc/app.config"
-      end
-
-      describe "for app.config" do
-        it "should create the app.config file in the temporary directory" do
-          File.should be_exist(File.expand_path(@app_config))
-        end
-
-        it "should be a correct Erlang config" do
-          config = File.read(@app_config)
-          config[-2..-1].should == '].'
-          config[0..0].should == '['
-        end
-
-        it "should set the backend to use the test backend" do
-          File.readlines(@app_config).should be_any do |line|
-            line =~ /\{storage_backend\s*,\s*(.*)\}/ && $1 == "riak_kv_test_backend"
-          end
-        end
-
-        it "should set the default ports to 9000-9002" do
-          config = File.readlines(@app_config)
-          config.should be_any do |line|
-            line =~ /\{web_port\s*,\s*(.*)\}/ && $1 == "9000"
-          end
-          config.should be_any do |line|
-            line =~ /\{handoff_port\s*,\s*(.*)\}/ && $1 == "9001"
-          end
-          config.should be_any do |line|
-            line =~ /\{pb_port\s*,\s*(.*)\}/ && $1 == "9002"
-          end
-        end
-
-        it "should set the ring directory to point to the temporary directory" do
-          config = File.readlines(@app_config)
-          config.should be_any do |line|
-            line =~ /\{ring_state_dir\s*,\s*(.*)\}/ && $1 == File.join(@server.temp_dir, "data", "ring")
-          end
-        end
-      end
-
-      describe "for vm.args" do
-        it "should create the vm.args file in the temporary directory" do
-          File.should be_exist(File.expand_path(@vm_args))
-        end
-
-        it "should set a quasi-random node name" do
-          File.readlines(@vm_args).should be_any do |line|
-            line =~ /^-name (.*)/ && $1 =~ /riaktest\d+@/
-          end
-        end
-
-        it "should set a quasi-random cookie" do
-          File.readlines(@vm_args).should be_any do |line|
-            line =~ /^-setcookie (.*)/ && $1 != "riak"
-          end
-        end
-      end
-
-      describe "for the riak script" do
-        it "should create the script in the temporary directory" do
-          File.should be_exist(File.expand_path(@riak_bin))
-        end
-
-        it "should modify the RUNNER_SCRIPT_DIR to point to the temporary directory" do
-          File.readlines(@riak_bin).should be_any do |line|
-            line =~ /RUNNER_SCRIPT_DIR=(.*)/ && $1 == File.expand_path("#{@server.temp_dir}/bin")
-
-          end
-        end
-
-        it "should modify the RUNNER_ETC_DIR to point to the temporary directory" do
-          File.readlines(@riak_bin).should be_any do |line|
-            line =~ /RUNNER_ETC_DIR=(.*)/ && $1 == File.expand_path("#{@server.temp_dir}/etc")
-          end
-        end
-
-        it "should modify the RUNNER_USER to point to the current user" do
-          File.readlines(@riak_bin).should be_any do |line|
-            line =~ /RUNNER_USER=(.*)/ && $1 == (ENV['USER'] || `whoami`)
-          end
-        end
-
-        it "should modify the RUNNER_LOG_DIR to point to the temporary directory" do
-          File.readlines(@riak_bin).should be_any do |line|
-            line =~ /RUNNER_LOG_DIR=(.*)/ && $1 == File.expand_path("#{@server.temp_dir}/log")
-          end
-        end
-
-        it "should modify the RUNNER_BASE_DIR so that it is not relative" do
-          File.readlines(@riak_bin).should be_any do |line|
-            line =~ /RUNNER_BASE_DIR=(.*)/ && $1.strip != "${RUNNER_SCRIPT_DIR%/*}" && File.directory?($1)
-          end
-        end
-
-        it "should modify the PIPE_DIR to point to the temporary directory" do
-          File.readlines(@riak_bin).should be_any do |line|
-            line =~ /PIPE_DIR=(.*)/ &&  $1 == File.expand_path("#{@server.temp_dir}/pipe") && File.directory?($1)
-          end
-        end
-      end
-    end
-
-    it "should cleanup the existing config" do
-      @server.prepare!
-      @server.cleanup
-      File.should_not be_directory(@server.temp_dir)
-    end
-
-    it "should start Riak in the background" do
-      @server.prepare!
-      @server.start.should be_true
-      @server.should be_started
-    end
-
-    it "should stop a started test server" do
-      @server.prepare!
-      @server.start.should be_true
-      @server.stop
-      @server.should_not be_started
-    end
+  it "should add the test backends to the code path" do
+    erl_src = File.expand_path("../../../../erl_src", __FILE__)
+    subject.env[:riak_kv][:add_paths].should include(erl_src)
+    app_config.should match(/\{add_paths, \[.*#{erl_src.inspect}.*\]\}/)
+  end
 
-    it "should recycle the server contents" do
-      begin
-        @server.prepare!
-        @server.start.should be_true
+  it "should use the KV test backend" do
+    subject.kv_backend.should == :riak_kv_test_backend
+    subject.env[:riak_kv][:storage_backend].should == :riak_kv_test_backend
+    app_config.should include("{storage_backend, riak_kv_test_backend}")
+  end
 
-        client = Riak::Client.new(:http_port => 9000)
-        obj = client['test_bucket'].new("test_item")
-        obj.data = {"data" => "testing"}
-        obj.store rescue nil
+  it "should use the Search test backend" do
+    subject.search_backend.should == :riak_search_test_backend
+    subject.env[:riak_search][:search_backend].should == :riak_search_test_backend
+    app_config.should include("{search_backend, riak_search_test_backend}")
+  end
 
-        @server.recycle
-        @server.should be_started
-        lambda do
-          client['test_bucket']['test_item']
-        end.should raise_error(Riak::FailedRequest)
-      ensure
-        @server.stop
-      end
-    end
+  it "should clear stored data" do
+    # TODO: use $test_server.to_host when client/host split is finished.
+    client = Riak::Client.new(:http_port => subject.http_port)
+    obj = client['test_bucket'].new("test_item")
+    obj.data = {"data" => "testing"}
+    obj.store # rescue nil
+
+    subject.drop
+    expect {
+      client['test_bucket']['test_item']
+    }.to raise_error(Riak::FailedRequest)
   end
 end

data/spec/riak/beefcake_protobuffs_backend_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", File.dirname(__FILE__))
+require 'spec_helper'
 require 'riak/client/beefcake/messages'
 
 describe Riak::Client::BeefcakeProtobuffsBackend do
@@ -45,7 +45,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend, '#mapred' do
     @backend = Riak::Client::BeefcakeProtobuffsBackend.new(@client)
     @backend.instance_variable_set(:@server_config, {})
   end
-  
+
   it "should not return nil for previous phases that don't return anything" do
     socket = stub(:socket).as_null_object
     socket.stub(:read).and_return(stub(:socket_header, :unpack => [2, 24]), stub(:socket_message), stub(:socket_header_2, :unpack => [0, 1]))
@@ -53,7 +53,8 @@ describe Riak::Client::BeefcakeProtobuffsBackend, '#mapred' do
     message.stub(:done).and_return(false, true)
     Riak::Client::BeefcakeProtobuffsBackend::RpbMapRedResp.stub(:decode => message)
     TCPSocket.stub(:new => socket)
-    
+    @backend.send(:reset_socket)
+
     @backend.mapred('').should == [{}]
   end
-end
+end