dalli 2.7.2 → 3.2.4

data/test/test_sasl.rb

@@ -1,110 +0,0 @@
-require 'helper'
-
-describe 'Sasl' do
-
-  # https://github.com/seattlerb/minitest/issues/298
-  def self.xit(msg, &block)
-  end
-
-  describe 'a server requiring authentication' do
-    before do
-      @server = mock()
-      @server.stubs(:request).returns(true)
-      @server.stubs(:weight).returns(1)
-      @server.stubs(:hostname).returns("localhost")
-      @server.stubs(:port).returns("19124")
-    end
-
-    describe 'without authentication credentials' do
-      before do
-        ENV['MEMCACHE_USERNAME'] = 'foo'
-        ENV['MEMCACHE_PASSWORD'] = 'wrongpwd'
-      end
-
-      after do
-        ENV['MEMCACHE_USERNAME'] = nil
-        ENV['MEMCACHE_PASSWORD'] = nil
-      end
-
-      it 'provide one test that passes' do
-        assert true
-      end
-
-      it 'gracefully handle authentication failures' do
-        memcached(19124, '-S') do |dc|
-          assert_error Dalli::DalliError, /32/ do
-            dc.set('abc', 123)
-          end
-        end
-      end
-    end
-
-    it 'fail SASL authentication with wrong options' do
-      memcached(19124, '-S') do |dc|
-        dc = Dalli::Client.new('localhost:19124', :username => 'foo', :password => 'wrongpwd')
-        assert_error Dalli::DalliError, /32/ do
-          dc.set('abc', 123)
-        end
-      end
-    end
-
-    # OSX: Create a SASL user for the memcached application like so:
-    #
-    # saslpasswd2 -a memcached -c testuser
-    #
-    # with password 'testtest'
-    describe 'in an authenticated environment' do
-      before do
-        ENV['MEMCACHE_USERNAME'] = 'testuser'
-        ENV['MEMCACHE_PASSWORD'] = 'testtest'
-      end
-
-      after do
-        ENV['MEMCACHE_USERNAME'] = nil
-        ENV['MEMCACHE_PASSWORD'] = nil
-      end
-
-      xit 'pass SASL authentication' do
-        memcached(19124, '-S') do |dc|
-          # I get "Dalli::DalliError: Error authenticating: 32" in OSX
-          # but SASL works on Heroku servers. YMMV.
-          assert_equal true, dc.set('abc', 123)
-          assert_equal 123, dc.get('abc')
-          results = dc.stats
-          assert_equal 1, results.size
-          assert_equal 38, results.values.first.size
-        end
-      end
-    end
-
-    xit 'pass SASL authentication with options' do
-      memcached(19124, '-S') do |dc|
-        dc = Dalli::Client.new('localhost:19124', :username => 'testuser', :password => 'testtest')
-        # I get "Dalli::DalliError: Error authenticating: 32" in OSX
-        # but SASL works on Heroku servers. YMMV.
-        assert_equal true, dc.set('abc', 123)
-        assert_equal 123, dc.get('abc')
-        results = dc.stats
-        assert_equal 1, results.size
-        assert_equal 38, results.values.first.size
-      end
-    end
-
-    it 'pass SASL as URI' do
-      Dalli::Server.expects(:new).with("localhost:19124",
-        :username => "testuser", :password => "testtest").returns(@server)
-      dc = Dalli::Client.new('memcached://testuser:testtest@localhost:19124')
-      dc.flush_all
-    end
-
-    it 'pass SASL as ring of URIs' do
-      Dalli::Server.expects(:new).with("localhost:19124",
-        :username => "testuser", :password => "testtest").returns(@server)
-      Dalli::Server.expects(:new).with("otherhost:19125",
-        :username => "testuser2", :password => "testtest2").returns(@server)
-      dc = Dalli::Client.new(['memcached://testuser:testtest@localhost:19124',
-      'memcached://testuser2:testtest2@otherhost:19125'])
-      dc.flush_all
-    end
-  end
-end

data/test/test_serializer.rb

@@ -1,30 +0,0 @@
-# encoding: utf-8
-require 'helper'
-require 'json'
-require 'memcached_mock'
-
-describe 'Serializer' do
-
-  it 'default to Marshal' do
-    memcached_kill(29198) do |dc|
-      memcache = Dalli::Client.new('127.0.0.1:29198')
-      memcache.set 1,2
-      assert_equal Marshal, memcache.instance_variable_get('@ring').servers.first.serializer
-    end
-  end
-
-  it 'support a custom serializer' do
-    memcached_kill(29198) do |dc|
-      memcache = Dalli::Client.new('127.0.0.1:29198', :serializer => JSON)
-      memcache.set 1,2
-      begin
-        assert_equal JSON, memcache.instance_variable_get('@ring').servers.first.serializer
-
-        memcached(19128) do |newdc|
-          assert newdc.set("json_test", {"foo" => "bar"})
-          assert_equal({"foo" => "bar"}, newdc.get("json_test"))
-        end
-      end
-    end
-  end
-end

data/test/test_server.rb

@@ -1,80 +0,0 @@
-require 'helper'
-
-describe Dalli::Server do
-  describe 'hostname parsing' do
-    it 'handles no port or weight' do
-      s = Dalli::Server.new('localhost')
-      assert_equal 'localhost', s.hostname
-      assert_equal 11211, s.port
-      assert_equal 1, s.weight
-    end
-
-    it 'handles a port, but no weight' do
-      s = Dalli::Server.new('localhost:11212')
-      assert_equal 'localhost', s.hostname
-      assert_equal 11212, s.port
-      assert_equal 1, s.weight
-    end
-
-    it 'handles a port and a weight' do
-      s = Dalli::Server.new('localhost:11212:2')
-      assert_equal 'localhost', s.hostname
-      assert_equal 11212, s.port
-      assert_equal 2, s.weight
-    end
-
-    it 'handles ipv4 addresses' do
-      s = Dalli::Server.new('127.0.0.1')
-      assert_equal '127.0.0.1', s.hostname
-      assert_equal 11211, s.port
-      assert_equal 1, s.weight
-    end
-
-    it 'handles ipv6 addresses' do
-      s = Dalli::Server.new('[::1]')
-      assert_equal '::1', s.hostname
-      assert_equal 11211, s.port
-      assert_equal 1, s.weight
-    end
-
-    it 'handles ipv6 addresses with port' do
-      s = Dalli::Server.new('[::1]:11212')
-      assert_equal '::1', s.hostname
-      assert_equal 11212, s.port
-      assert_equal 1, s.weight
-    end
-
-    it 'handles ipv6 addresses with port and weight' do
-      s = Dalli::Server.new('[::1]:11212:2')
-      assert_equal '::1', s.hostname
-      assert_equal 11212, s.port
-      assert_equal 2, s.weight
-    end
-
-    it 'handles a FQDN' do
-      s = Dalli::Server.new('my.fqdn.com')
-      assert_equal 'my.fqdn.com', s.hostname
-      assert_equal 11211, s.port
-      assert_equal 1, s.weight
-    end
-
-    it 'handles a FQDN with port and weight' do
-      s = Dalli::Server.new('my.fqdn.com:11212:2')
-      assert_equal 'my.fqdn.com', s.hostname
-      assert_equal 11212, s.port
-      assert_equal 2, s.weight
-    end
-  end
-
-  describe 'ttl translation' do
-    it 'does not translate ttls under 30 days' do
-      s = Dalli::Server.new('localhost')
-      assert_equal s.send(:sanitize_ttl, 30*24*60*60), 30*24*60*60
-    end
-
-    it 'translates ttls over 30 days into timestamps' do
-      s = Dalli::Server.new('localhost')
-      assert_equal s.send(:sanitize_ttl, 30*24*60*60 + 1), Time.now.to_i + 30*24*60*60+1
-    end
-  end
-end