ar_mysql_flexmaster 0.4.4 → 0.5.0

data/test/integration/there_and_back_again_test.rb

@@ -1,34 +1,22 @@
-require 'bundler/setup'
-require 'mysql2'
-require 'test/unit/assertions'
+require_relative "../integration_helper"
 
-include Test::Unit::Assertions
-require_relative '../boot_mysql_env'
-master_cut_script = File.expand_path(File.dirname(__FILE__)) + "/../../bin/master_cut"
+class ThereAndBackAgain < Minitest::Test
+  def test_there_and_back
+    $mysql_master.connection.query("set GLOBAL READ_ONLY=0")
+    $mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
 
-$mysql_master.connection.query("set GLOBAL READ_ONLY=0")
-$mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
+    puts "testing first cutover..."
 
-def assert_ro(cx, str, bool)
-  expected = bool ? 1 : 0
-  if expected != cx.query("select @@read_only as ro").first['ro']
-    $stderr.puts("#{str} is #{bool ? 'read-write' : 'read-only'} but I expected otherwise!")
-    exit 1
-  end
-end
-puts "testing first cutover..."
-
-system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p '' -r -s"
-assert_ro($mysql_master.connection, 'original master', true)
-assert_ro($mysql_slave.connection, 'original slave', false)
-
-assert "Yes" == $mysql_master.connection.query("show slave status").first['Slave_IO_Running']
+    system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p '' -r -s"
+    assert_ro($mysql_master.connection, 'original master', true)
+    assert_ro($mysql_slave.connection, 'original slave', false)
 
-system "#{master_cut_script} 127.0.0.1:#{$mysql_slave.port} 127.0.0.1:#{$mysql_master.port} root -p '' -r"
-assert_ro($mysql_master.connection, 'original master', false)
-assert_ro($mysql_slave.connection, 'original slave', true)
+    assert "Yes" == $mysql_master.connection.query("show slave status").first['Slave_IO_Running']
 
-assert "No" == $mysql_slave.connection.query("show slave status").first['Slave_IO_Running']
-
-puts "everything went real nice."
+    system "#{master_cut_script} 127.0.0.1:#{$mysql_slave.port} 127.0.0.1:#{$mysql_master.port} root -p '' -r"
+    assert_ro($mysql_master.connection, 'original master', false)
+    assert_ro($mysql_slave.connection, 'original slave', true)
 
+    assert "No" == $mysql_slave.connection.query("show slave status").first['Slave_IO_Running']
+  end
+end

data/test/integration/with_queries_to_be_killed_test.rb

@@ -1,37 +1,27 @@
-require 'bundler/setup'
-require 'mysql2'
-require_relative '../boot_mysql_env'
-master_cut_script = File.expand_path(File.dirname(__FILE__)) + "/../../bin/master_cut"
-
-puts "testing with long running queries..."
-
-$mysql_master.connection.query("set GLOBAL READ_ONLY=0")
-$mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
-$mysql_master.connection.send(:reconnect=, true)
-$mysql_slave.connection.send(:reconnect=, true)
-
-thread = Thread.new {
-  begin
-    $mysql_master.connection.query("update flexmaster_test.users set name=sleep(600)")
-    puts "Query did not get killed!  Bad."
-    exit 1
-  rescue Exception => e
-    puts e
+require_relative "../integration_helper"
+class WithKillableQueries < Minitest::Test
+  def test_with_queries_to_be_killed
+    puts "testing with long running queries..."
+
+    $mysql_master.connection.query("set GLOBAL READ_ONLY=0")
+    $mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
+
+    thread = Thread.new {
+      begin
+        $mysql_master.connection.query("update flexmaster_test.users set name=sleep(600)")
+        assert false, "Query did not get killed!  Bad."
+        exit 1
+      rescue Exception => e
+        puts e
+      end
+    }
+
+    system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p ''"
+
+    thread.join
+
+    $mysql_master.reconnect!
+    assert_ro($mysql_master.connection, 'master', true)
+    assert_ro($mysql_slave.connection, 'slave', false)
   end
-}
-
-system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p ''"
-
-thread.join
-
-if $mysql_master.connection.query("select @@read_only as ro").first['ro'] != 1
-  puts "Master is not readonly!"
-  exit 1
-end
-
-if $mysql_slave.connection.query("select @@read_only as ro").first['ro'] != 0
-  puts "Slave is not readwrite!"
-  exit 1
 end
-
-puts "everything seemed to go ok..."

data/test/integration/wrong_setup_test.rb

@@ -1,32 +1,24 @@
-require 'bundler/setup'
-require 'mysql2'
-require_relative '../boot_mysql_env'
-
+require_relative "../integration_helper"
+class WrongSetupTest < Minitest::Test
+  def assert_script_failed
+    assert(!system("#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p ''"))
+  end
 
-def assert_script_failed
-  master_cut_script = File.expand_path(File.dirname(__FILE__)) + "/../../bin/master_cut"
-  if system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p ''"
-    puts "Script returned ok instead of false!"
-    exit 1
+  def test_wrong
+    puts "testing cutover with incorrect master config..."
+    $mysql_master.connection.query("set GLOBAL READ_ONLY=0")
+    $mysql_slave.connection.query("set GLOBAL READ_ONLY=0")
+    assert_script_failed
+
+    puts "testing cutover with incorrect slave config..."
+    $mysql_master.connection.query("set GLOBAL READ_ONLY=0")
+    $mysql_slave.connection.query("set GLOBAL READ_ONLY=0")
+    assert_script_failed
+
+    puts "testing cutover with stopped slave"
+    $mysql_master.connection.query("set GLOBAL READ_ONLY=0")
+    $mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
+    $mysql_slave.connection.query("slave stop")
+    assert_script_failed
   end
 end
-
-puts "testing cutover with incorrect master config..."
-$mysql_master.connection.query("set GLOBAL READ_ONLY=0")
-$mysql_slave.connection.query("set GLOBAL READ_ONLY=0")
-assert_script_failed
-
-puts "testing cutover with incorrect slave config..."
-$mysql_master.connection.query("set GLOBAL READ_ONLY=0")
-$mysql_slave.connection.query("set GLOBAL READ_ONLY=0")
-assert_script_failed
-
-puts "testing cutover with stopped slave"
-$mysql_master.connection.query("set GLOBAL READ_ONLY=0")
-$mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
-$mysql_slave.connection.query("slave stop")
-assert_script_failed
-
-
-puts "Tests passed."
-

data/test/integration_helper.rb

@@ -0,0 +1,19 @@
+require 'bundler/setup'
+require 'mysql2'
+require 'minitest/autorun'
+
+if !defined?(Minitest::Test)
+  Minitest::Test = MiniTest::Unit::TestCase
+end
+
+require_relative 'boot_mysql_env'
+
+def assert_ro(cx, str, bool)
+  expected = bool ? 1 : 0
+  assert_equal expected,  cx.query("select @@read_only as ro").first['ro'], "#{str} is #{bool ? 'read-write' : 'read-only'} but I expected otherwise!"
+end
+
+def master_cut_script
+  File.expand_path(File.dirname(__FILE__)) + "/../bin/master_cut"
+end
+

metadata

@@ -1,112 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.4.4
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql_isolated_server
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.5'
 description: ar_mysql_flexmaster allows configuring N mysql servers in database.yml
   and auto-selects which is a master at runtime
 email:
@@ -116,21 +117,26 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- Appraisals
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - ar_mysql_flexmaster.gemspec
 - bin/master_cut
-- gemfiles/rails2.gemfile
-- gemfiles/rails2.gemfile.lock
+- gemfiles/rails2.3.gemfile
+- gemfiles/rails2.3.gemfile.lock
+- gemfiles/rails3.0.gemfile
+- gemfiles/rails3.0.gemfile.lock
 - gemfiles/rails3.2.gemfile
 - gemfiles/rails3.2.gemfile.lock
-- gemfiles/rails3.gemfile
-- gemfiles/rails3.gemfile.lock
+- gemfiles/rails4.0.gemfile
+- gemfiles/rails4.0.gemfile.lock
+- gemfiles/rails4.1.gemfile
+- gemfiles/rails4.1.gemfile.lock
+- gemfiles/rails4.2.gemfile
+- gemfiles/rails4.2.gemfile.lock
 - lib/active_record/connection_adapters/mysql_flexmaster_adapter.rb
 - lib/ar_mysql_flexmaster.rb
 - test/ar_flexmaster_test.rb
@@ -141,30 +147,30 @@ files:
 - test/integration/there_and_back_again_test.rb
 - test/integration/with_queries_to_be_killed_test.rb
 - test/integration/wrong_setup_test.rb
+- test/integration_helper.rb
 - unplanned_failovers.md
 homepage: http://github.com/osheroff/ar_mysql_flexmaster
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: select a master at runtime from a list
 test_files:
 - test/ar_flexmaster_test.rb
@@ -175,4 +181,4 @@ test_files:
 - test/integration/there_and_back_again_test.rb
 - test/integration/with_queries_to_be_killed_test.rb
 - test/integration/wrong_setup_test.rb
-has_rdoc: 
+- test/integration_helper.rb

data/Appraisals

@@ -1,14 +0,0 @@
-appraise "rails2" do
-  gem "rails", "~> 2.3.15"
-  gem 'mysql2', "~> 0.2.0"
-end
-
-appraise "rails3" do
-  gem "rails", "~> 3.0.0"
-  gem 'mysql2', "~> 0.2.0"
-end
-
-appraise "rails3.2" do
-  gem "rails", "~> 3.2.0"
-  gem 'mysql2', "~> 0.3.0"
-end

data/gemfiles/rails2.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "debugger", "~>1.5.0"
-gem "appraisal"
-gem "rails", "~> 2.3.15"
-gem "mysql2", "~> 0.2.0"
-
-gemspec :path=>"../"

data/gemfiles/rails3.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "debugger", "~>1.5.0"
-gem "appraisal"
-gem "rails", "~> 3.0.0"
-gem "mysql2", "~> 0.2.0"
-
-gemspec :path=>"../"