Issue vagrant-landrush#16 Making tests run on Windows

.rubocop_todo.yml

@@ -155,6 +155,7 @@ Style/RescueModifier:
   Exclude:
     - 'lib/landrush/server.rb'
     - 'lib/landrush/store.rb'
+    - 'test/landrush/server_test.rb'
 
 # Offense count: 6
 # Cop supports --auto-correct.

Rakefile

@@ -1,15 +1,30 @@
 require 'bundler/gem_tasks'
+require 'rake'
 require 'rake/testtask'
 require 'rake/clean'
 require 'rubocop/rake_task'
 
 CLOBBER.include('pkg/*')
 
+# Default test task
 Rake::TestTask.new do |t|
   t.pattern = 'test/**/*_test.rb'
   t.libs << 'test'
 end
 
+targets = []
+Dir.glob('./test/**/*_test.rb').each do |test_file|
+  targets << test_file
+end
+
+targets.each do |target|
+  target_name = 'test-' + File.basename(target).chomp('_test.rb')
+  Rake::TestTask.new(target_name.to_sym) do |t|
+    t.pattern = target.to_s
+    t.libs << 'test'
+  end
+end
+
 task default: [
   :rubocop,
   :test

lib/landrush/server.rb

@@ -70,7 +70,7 @@ def self.start
     end
 
     def self.stop
-      puts 'Stopping daemon...'
+      # puts 'Stopping daemon...'
 
       # Check if the pid file exists...
       unless File.file?(pid_file)

lib/landrush/store.rb

@@ -11,6 +11,11 @@ def self.config
       @config ||= new(Server.working_dir.join('config.json'))
     end
 
+    def self.reset
+      @config = nil
+      @hosts = nil
+    end
+
     attr_accessor :backing_file
 
     def initialize(backing_file)

test/landrush/server_test.rb

@@ -1,17 +1,16 @@
 require 'test_helper'
+require 'resolv'
 
 module Landrush
   describe Server do
     def query(host)
-      output = `dig -p #{Server.port} @127.0.0.1 #{host}`
-      answer_line = output.split("\n").grep(/^#{Regexp.escape(host)}/).first
-      answer_line.split.last
+      Resolv::DNS.open(:nameserver_port => [["127.0.0.1", Server.port]]) do |r|
+        r.getaddress(host).to_s
+      end
     end
 
-    def query_ptr(host)
-      output = `dig ptr -p #{Server.port} @127.0.0.1 #{host}`
-      answer_line = output.split("\n").grep(/^#{Regexp.escape(host)}/).first
-      answer_line.split.last
+    def wait_for_port
+      sleep 1 until (TCPSocket.open('127.0.0.1', Server.port) rescue nil)
     end
 
     describe 'start/stop' do
@@ -24,11 +23,15 @@ def query_ptr(host)
       end
 
       # FIXME: This test requires network access.
-      #        Which is not airplane hacking friendly. >:p
+      #       Which is not airplane hacking friendly. >:p
       it 'can be queried for upstream entries' do
-        skip("needs network, and I am on an airplane without wifi")
+        # skip("needs network, and I am on an airplane without wifi")
+        Store.config.set('upstream', [[:udp, '8.8.8.8', 53], [:tcp, '8.8.8.8', 53]])
+
         Server.start
 
+        wait_for_port
+
         query("phinze.com").must_match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)
       end
 
@@ -40,8 +43,9 @@ def query_ptr(host)
 
         Store.hosts.set(fake_host, fake_ip)
 
+        wait_for_port
+
         query(fake_host).must_equal fake_ip
-        query_ptr(fake_host).must_equal fake_ip + '.'
       end
 
       it 'responds properly to configured cname entries' do
@@ -54,7 +58,9 @@ def query_ptr(host)
         Store.hosts.set(fake_host, fake_ip)
         Store.hosts.set(fake_cname, fake_host)
 
-        query(fake_cname).must_equal fake_host + '.'
+        wait_for_port
+
+        query(fake_cname).must_equal fake_ip
       end
 
       it 'also resolves wildcard subdomains to a given machine' do
@@ -65,6 +71,8 @@ def query_ptr(host)
 
         Store.hosts.set(fake_host, fake_ip)
 
+        wait_for_port
+
         query("green.#{fake_host}").must_match(fake_ip)
         query("blue.#{fake_host}").must_match(fake_ip)
       end

test/landrush/store_test.rb

@@ -3,11 +3,12 @@
 module Landrush
   describe Store do
     before do
-      @store = Store.new(Tempfile.new(%w[landrush_test_store .json]))
+      @temp_file = Tempfile.new(%w[landrush_test_store .json])
+      @store = Store.new(@temp_file)
     end
 
     after do
-      @store.backing_file.unlink
+      @temp_file.unlink
     end
 
     describe "set" do

test/support/fake_resolver_config.rb

@@ -1,7 +1,10 @@
+require 'tmpdir'
+
 module FakeResolverConfigHooks
   def setup
     super
-    @test_resolver_config_dir = Pathname('/tmp/landrush_fake_resolver')
+    tempdir = Dir.mktmpdir('landrush_fake_resolver')
+    @test_resolver_config_dir = Pathname(tempdir)
     Landrush::ResolverConfig.config_dir = @test_resolver_config_dir
     Landrush::ResolverConfig.sudo       = ''
   end

test/support/fake_working_dir.rb

@@ -1,7 +1,8 @@
 module FakeWorkingDirHooks
   def setup
     super
-    Landrush::Server.working_dir = '/tmp/vagrant_landrush_test_working_dir'
+    tempdir = Dir.mktmpdir('vagrant_landrush_test_working_dir-')
+    Landrush::Server.working_dir = tempdir
   end
 
   def teardown

test/support/test_server_daemon.rb

@@ -34,6 +34,7 @@ def teardown
     # Cleanup any stray server instances from tests
     if Landrush::Server.running?
       Landrush::Server.stop
+      Landrush::Store.reset
     end
   end
 end