From 5326214033b4f26ec426a0313c164f5de0225207 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 9 Dec 2011 23:50:05 +0000 Subject: tests: speedup tests that require hitting mogstored By pre-creating devN dirs, mogstored can create usage files sooner and we won't have to wait 10s between "df" runs. --- test/fresh.rb | 6 ++++-- test/test_mogstored_rack.rb | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/fresh.rb b/test/fresh.rb index 2e220a0..2fddaaf 100644 --- a/test/fresh.rb +++ b/test/fresh.rb @@ -120,8 +120,8 @@ EOF args = { :ip => @test_host, :port => @mogstored_http_port } args[:status] = "alive" @admin.create_host("me", args) - Dir.mkdir("#@docroot/dev1") - Dir.mkdir("#@docroot/dev2") + assert File.directory?("#@docroot/dev1") + assert File.directory?("#@docroot/dev2") yield_for_monitor_update { @admin.get_hosts.empty? or break } # TODO: allow adding devices via our MogileFS::Admin class @@ -199,6 +199,8 @@ EOF def setup_mogstored @docroot = Dir.mktmpdir(["mogfresh", "docroot"]) + Dir.mkdir("#@docroot/dev1") + Dir.mkdir("#@docroot/dev2") @mogstored_mgmt = TCPServer.new(@test_host, 0) @mogstored_http = TCPServer.new(@test_host, 0) @mogstored_mgmt_port = @mogstored_mgmt.addr[1] diff --git a/test/test_mogstored_rack.rb b/test/test_mogstored_rack.rb index ba4986f..ea45e46 100644 --- a/test/test_mogstored_rack.rb +++ b/test/test_mogstored_rack.rb @@ -130,6 +130,8 @@ class TestMogstoredRack < Test::Unit::TestCase def setup_mogstored @docroot = Dir.mktmpdir(["mogfresh", "docroot"]) + Dir.mkdir("#@docroot/dev1") + Dir.mkdir("#@docroot/dev2") @mogstored_mgmt = TCPServer.new(@test_host, 0) @mogstored_http = TCPServer.new(@test_host, 0) @mogstored_mgmt_port = @mogstored_mgmt.addr[1] -- cgit v1.2.3-24-ge0c7