elastomer-client 2.2.0 → 2.3.0

data/test/client/nodes_test.rb

@@ -16,26 +16,24 @@ describe Elastomer::Client::Nodes do
     assert node.key?("indices"), "indices stats are returned"
   end
 
-  if es_version_1_x?
-    it "fitlers node info" do
-      h = $client.nodes.info(:info => "os")
-      node = h["nodes"].values.first
-      assert node.key?("os"), "expected os info to be present"
-      assert !node.key?("jvm"), "expected jvm info to be absent"
-
-      h = $client.nodes.info(:info => %w[jvm process])
-      node = h["nodes"].values.first
-      assert node.key?("jvm"), "expected jvm info to be present"
-      assert node.key?("process"), "expected process info to be present"
-      assert !node.key?("network"), "expected network info to be absent"
-    end
-
-    it "filters node stats" do
-      h = $client.nodes.stats(:stats => "http")
-      node = h["nodes"].values.first
-      assert node.key?("http"), "expected http stats to be present"
-      assert !node.key?("indices"), "expected indices stats to be absent"
-    end
+  it "filters node info" do
+    h = $client.nodes.info(:info => "os")
+    node = h["nodes"].values.first
+    assert node.key?("os"), "expected os info to be present"
+    assert !node.key?("jvm"), "expected jvm info to be absent"
+
+    h = $client.nodes.info(:info => %w[jvm process])
+    node = h["nodes"].values.first
+    assert node.key?("jvm"), "expected jvm info to be present"
+    assert node.key?("process"), "expected process info to be present"
+    assert !node.key?("network"), "expected network info to be absent"
+  end
+
+  it "filters node stats" do
+    h = $client.nodes.stats(:stats => "http")
+    node = h["nodes"].values.first
+    assert node.key?("http"), "expected http stats to be present"
+    assert !node.key?("indices"), "expected indices stats to be absent"
   end
 
   it "gets the hot threads for the node(s)" do

data/test/client/percolator_test.rb

@@ -15,7 +15,7 @@ describe Elastomer::Client::Percolator do
   describe "when an index exists" do
     before do
       @index.create(nil)
-      wait_for_index(@index_name)
+      wait_for_index(@index.name)
     end
 
     it "creates a query" do

data/test/client/repository_test.rb

@@ -1,111 +1,107 @@
 require File.expand_path("../../test_helper", __FILE__)
 
 describe Elastomer::Client::Repository do
+  before do
+    if !run_snapshot_tests?
+      skip "To enable snapshot tests, add a path.repo setting to your elasticsearch.yml file."
+    end
 
-  if es_version_1_x?
-
-    before do
-      if !run_snapshot_tests?
-        skip "To enable snapshot tests, add a path.repo setting to your elasticsearch.yml file."
-      end
+    @name = "elastomer-repository-test"
+    @repo = $client.repository(@name)
+  end
 
-      @name = "elastomer-repository-test"
-      @repo = $client.repository(@name)
+  it "determines if a repo exists" do
+    assert_equal false, @repo.exists?
+    assert_equal false, @repo.exist?
+    with_tmp_repo(@name) do
+      assert_equal true, @repo.exists?
     end
+  end
 
-    it "determines if a repo exists" do
-      assert_equal false, @repo.exists?
-      assert_equal false, @repo.exist?
-      with_tmp_repo(@name) do
-        assert_equal true, @repo.exists?
-      end
-    end
+  it "creates repos" do
+    response = create_repo(@name)
+    assert_equal true, response["acknowledged"]
+    delete_repo(@name)
+  end
 
-    it "creates repos" do
-      response = create_repo(@name)
-      assert_equal true, response["acknowledged"]
-      delete_repo(@name)
-    end
+  it "cannot create a repo without a name" do
+    lambda {
+      create_repo(nil)
+    }.must_raise ArgumentError
+  end
 
-    it "cannot create a repo without a name" do
-      lambda {
-        create_repo(nil)
-      }.must_raise ArgumentError
+  it "gets repos" do
+    with_tmp_repo do |repo|
+      response = repo.get
+      refute_nil response[repo.name]
     end
+  end
 
-    it "gets repos" do
-      with_tmp_repo do |repo|
-        response = repo.get
-        refute_nil response[repo.name]
-      end
+  it "gets all repos" do
+    with_tmp_repo do |repo|
+      response = $client.repository.get
+      refute_nil response[repo.name]
     end
+  end
 
-    it "gets all repos" do
-      with_tmp_repo do |repo|
-        response = $client.repository.get
-        refute_nil response[repo.name]
-      end
+  it "gets repo status" do
+    with_tmp_repo do |repo|
+      response = repo.status
+      assert_equal [], response["snapshots"]
     end
+  end
 
-    it "gets repo status" do
-      with_tmp_repo do |repo|
-        response = repo.status
-        assert_equal [], response["snapshots"]
-      end
-    end
+  it "gets status of all repos" do
+    response = $client.repository.status
+    assert_equal [], response["snapshots"]
+  end
 
-    it "gets status of all repos" do
-      response = $client.repository.status
-      assert_equal [], response["snapshots"]
+  it "updates repos" do
+    with_tmp_repo do |repo|
+      settings = repo.get[repo.name]["settings"]
+      response = repo.update(:type => "fs", :settings => settings.merge("compress" => true))
+      assert_equal true, response["acknowledged"]
+      assert_equal "true", repo.get[repo.name]["settings"]["compress"]
     end
+  end
 
-    it "updates repos" do
-      with_tmp_repo do |repo|
+  it "cannot update a repo without a name" do
+    with_tmp_repo do |repo|
+      lambda {
         settings = repo.get[repo.name]["settings"]
-        response = repo.update(:type => "fs", :settings => settings.merge("compress" => true))
-        assert_equal true, response["acknowledged"]
-        assert_equal "true", repo.get[repo.name]["settings"]["compress"]
-      end
+        $client.repository.update(:type => "fs", :settings => settings.merge("compress" => true))
+      }.must_raise ArgumentError
     end
+  end
 
-    it "cannot update a repo without a name" do
-      with_tmp_repo do |repo|
-        lambda {
-          settings = repo.get[repo.name]["settings"]
-          $client.repository.update(:type => "fs", :settings => settings.merge("compress" => true))
-        }.must_raise ArgumentError
-      end
+  it "deletes repos" do
+    with_tmp_repo do |repo|
+      response = repo.delete
+      assert_equal true, response["acknowledged"]
+      assert_equal false, repo.exists?
     end
+  end
 
-    it "deletes repos" do
-      with_tmp_repo do |repo|
-        response = repo.delete
-        assert_equal true, response["acknowledged"]
-        assert_equal false, repo.exists?
-      end
-    end
+  it "cannot delete a repo without a name" do
+    lambda {
+      $client.repository.delete
+    }.must_raise ArgumentError
+  end
 
-    it "cannot delete a repo without a name" do
-      lambda {
-        $client.repository.delete
-      }.must_raise ArgumentError
-    end
+  it "gets snapshots" do
+    with_tmp_repo do |repo|
+      response = repo.snapshots.get
+      assert_equal [], response["snapshots"]
+
+      create_snapshot(repo, "test-snapshot")
+      response = repo.snapshot.get
+      assert_equal ["test-snapshot"], response["snapshots"].collect { |info| info["snapshot"] }
 
-    it "gets snapshots" do
-      with_tmp_repo do |repo|
-        response = repo.snapshots.get
-        assert_equal [], response["snapshots"]
-
-        create_snapshot(repo, "test-snapshot")
-        response = repo.snapshot.get
-        assert_equal ["test-snapshot"], response["snapshots"].collect { |info| info["snapshot"] }
-
-        create_snapshot(repo, "test-snapshot2")
-        response  = repo.snapshots.get
-        snapshot_names = response["snapshots"].collect { |info| info["snapshot"] }
-        assert_includes snapshot_names, "test-snapshot"
-        assert_includes snapshot_names, "test-snapshot2"
-      end
+      create_snapshot(repo, "test-snapshot2")
+      response  = repo.snapshots.get
+      snapshot_names = response["snapshots"].collect { |info| info["snapshot"] }
+      assert_includes snapshot_names, "test-snapshot"
+      assert_includes snapshot_names, "test-snapshot2"
     end
   end
 end

data/test/client/snapshot_test.rb

@@ -1,125 +1,125 @@
-
 require File.expand_path("../../test_helper", __FILE__)
 
 describe Elastomer::Client::Snapshot do
-  if es_version_1_x?
-    before do
-      if !run_snapshot_tests?
-        skip "To enable snapshot tests, add a path.repo setting to your elasticsearch.yml file."
-      end
+  before do
+    @index = nil
+    @restored_index = nil
 
-      @index_name = "elastomer-snapshot-test-index"
-      @index = $client.index(@index_name)
-      @name = "elastomer-test"
+    if !run_snapshot_tests?
+      skip "To enable snapshot tests, add a path.repo setting to your elasticsearch.yml file."
     end
 
-    after do
-      @index.delete if @index && @index.exists?
+    @index_name = "elastomer-snapshot-test-index"
+    @index = $client.index(@index_name)
+    @name = "elastomer-test"
+  end
+
+  after do
+    @index.delete if @index && @index.exists?
+  end
+
+  it "determines if a snapshot exists" do
+    with_tmp_repo do |repo|
+      snapshot = repo.snapshot(@name)
+      assert_equal false, snapshot.exists?
+      assert_equal false, snapshot.exist?
+      snapshot.create({}, :wait_for_completion => true)
+      assert_equal true, snapshot.exist?
     end
+  end
 
-    it "determines if a snapshot exists" do
-      with_tmp_repo do |repo|
-        snapshot = repo.snapshot(@name)
-        assert_equal false, snapshot.exists?
-        assert_equal false, snapshot.exist?
-        snapshot.create({}, :wait_for_completion => true)
-        assert_equal true, snapshot.exist?
-      end
+  it "creates snapshots" do
+    with_tmp_repo do |repo|
+      response = repo.snapshot(@name).create({}, :wait_for_completion => true)
+      assert_equal @name, response["snapshot"]["snapshot"]
     end
+  end
 
-    it "creates snapshots" do
-      with_tmp_repo do |repo|
-        response = repo.snapshot(@name).create({}, :wait_for_completion => true)
-        assert_equal @name, response["snapshot"]["snapshot"]
-      end
+  it "creates snapshots with options" do
+    @index.create(:number_of_shards => 1, :number_of_replicas => 0)
+    with_tmp_repo do |repo|
+      response = repo.snapshot(@name).create({:indices => [@index_name]}, :wait_for_completion => true)
+      assert_equal [@index_name], response["snapshot"]["indices"]
+      assert_equal 1, response["snapshot"]["shards"]["total"]
     end
+  end
 
-    it "creates snapshots with options" do
-      @index.create(:number_of_shards => 1, :number_of_replicas => 0)
-      with_tmp_repo do |repo|
-        response = repo.snapshot(@name).create({:indices => [@index_name]}, :wait_for_completion => true)
-        assert_equal [@index_name], response["snapshot"]["indices"]
-        assert_equal 1, response["snapshot"]["shards"]["total"]
-      end
+  it "gets snapshot info for one and all" do
+    with_tmp_snapshot do |snapshot, repo|
+      response = snapshot.get
+      assert_equal snapshot.name, response["snapshots"][0]["snapshot"]
+      response = repo.snapshots.get
+      assert_equal snapshot.name, response["snapshots"][0]["snapshot"]
     end
+  end
 
-    it "gets snapshot info for one and all" do
-      with_tmp_snapshot do |snapshot, repo|
-        response = snapshot.get
-        assert_equal snapshot.name, response["snapshots"][0]["snapshot"]
-        response = repo.snapshots.get
-        assert_equal snapshot.name, response["snapshots"][0]["snapshot"]
-      end
+  it "gets snapshot status for one and all" do
+    @index.create(:number_of_shards => 1, :number_of_replicas => 0)
+    with_tmp_repo do |repo|
+      repo.snapshot(@name).create({:indices => [@index_name]}, :wait_for_completion => true)
+      response = repo.snapshot(@name).status
+      assert_equal 1, response["snapshots"][0]["shards_stats"]["total"]
     end
+  end
 
-    it "gets snapshot status for one and all" do
-      @index.create(:number_of_shards => 1, :number_of_replicas => 0)
-      with_tmp_repo do |repo|
-        repo.snapshot(@name).create({:indices => [@index_name]}, :wait_for_completion => true)
-        response = repo.snapshot(@name).status
-        assert_equal 1, response["snapshots"][0]["shards_stats"]["total"]
-      end
+  it "gets status of snapshots in progress" do
+    # we can't reliably get status of an in-progress snapshot in tests, so
+    # check for an empty result instead
+    with_tmp_repo do |repo|
+      response = repo.snapshots.status
+      assert_equal [], response["snapshots"]
+      response = $client.snapshot.status
+      assert_equal [], response["snapshots"]
     end
+  end
 
-    it "gets status of snapshots in progress" do
-      # we can't reliably get status of an in-progress snapshot in tests, so
-      # check for an empty result instead
-      with_tmp_repo do |repo|
-        response = repo.snapshots.status
-        assert_equal [], response["snapshots"]
-        response = $client.snapshot.status
-        assert_equal [], response["snapshots"]
-      end
+  it "disallows nil repo name with non-nil snapshot name" do
+    assert_raises(ArgumentError) { $client.repository.snapshot("snapshot") }
+    assert_raises(ArgumentError) { $client.snapshot(nil, "snapshot") }
+  end
+
+  it "deletes snapshots" do
+    with_tmp_snapshot do |snapshot|
+      response = snapshot.delete
+      assert_equal true, response["acknowledged"]
     end
+  end
 
-    it "disallows nil repo name with non-nil snapshot name" do
-      assert_raises(ArgumentError) { $client.repository.snapshot("snapshot") }
-      assert_raises(ArgumentError) { $client.snapshot(nil, "snapshot") }
+  it "restores snapshots" do
+    @index.create(:number_of_shards => 1, :number_of_replicas => 0)
+    wait_for_index(@index_name)
+    with_tmp_repo do |repo|
+      snapshot = repo.snapshot(@name)
+      snapshot.create({:indices => [@index_name]}, :wait_for_completion => true)
+      @index.delete
+      response = snapshot.restore({}, :wait_for_completion => true)
+      assert_equal 1, response["snapshot"]["shards"]["total"]
     end
+  end
 
-    it "deletes snapshots" do
-      with_tmp_snapshot do |snapshot|
-        response = snapshot.delete
-        assert_equal true, response["acknowledged"]
-      end
+  describe "restoring to a different index" do
+    before do
+      @restored_index_name = "#{@index_name}-restored"
+      @restored_index = $client.index(@restored_index_name)
+    end
+
+    after do
+      @restored_index.delete if @restored_index && @restored_index.exists?
     end
 
-    it "restores snapshots" do
+    it "restores snapshots with options" do
       @index.create(:number_of_shards => 1, :number_of_replicas => 0)
       wait_for_index(@index_name)
       with_tmp_repo do |repo|
         snapshot = repo.snapshot(@name)
         snapshot.create({:indices => [@index_name]}, :wait_for_completion => true)
-        @index.delete
-        response = snapshot.restore({}, :wait_for_completion => true)
+        response = snapshot.restore({
+          :rename_pattern => @index_name,
+          :rename_replacement => @restored_index_name
+        }, :wait_for_completion => true)
+        assert_equal [@restored_index_name], response["snapshot"]["indices"]
         assert_equal 1, response["snapshot"]["shards"]["total"]
       end
     end
-
-    describe "restoring to a different index" do
-      before do
-        @restored_index_name = "#{@index_name}-restored"
-        @restored_index = $client.index(@restored_index_name)
-      end
-
-      after do
-        @restored_index.delete if @restored_index && @restored_index.exists?
-      end
-
-      it "restores snapshots with options" do
-        @index.create(:number_of_shards => 1, :number_of_replicas => 0)
-        wait_for_index(@index_name)
-        with_tmp_repo do |repo|
-          snapshot = repo.snapshot(@name)
-          snapshot.create({:indices => [@index_name]}, :wait_for_completion => true)
-          response = snapshot.restore({
-            :rename_pattern => @index_name,
-            :rename_replacement => @restored_index_name
-          }, :wait_for_completion => true)
-          assert_equal [@restored_index_name], response["snapshot"]["indices"]
-          assert_equal 1, response["snapshot"]["shards"]["total"]
-        end
-      end
-    end
   end
 end