From 74c5c1621f840c96b6404f29f17283001b55a86b Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Tue, 8 Jan 2013 10:22:11 -0500 Subject: [PATCH] regression tests working --- lib/Bio/Graphics/Browser2/Render/Slave/AWS_Balancer.pm | 2 +- t/00.compile.t | 3 ++- t/07.balancer.t | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/Bio/Graphics/Browser2/Render/Slave/AWS_Balancer.pm b/lib/Bio/Graphics/Browser2/Render/Slave/AWS_Balancer.pm index 38e57fea8..765e928f9 100644 --- a/lib/Bio/Graphics/Browser2/Render/Slave/AWS_Balancer.pm +++ b/lib/Bio/Graphics/Browser2/Render/Slave/AWS_Balancer.pm @@ -5,7 +5,7 @@ package Bio::Graphics::Browser2::Render::Slave::AWS_Balancer; use strict; use Parse::Apache::ServerStatus; -use VM::EC2 1.21; +use VM::EC2 1.22; use VM::EC2::Instance::Metadata; use VM::EC2::Staging::Manager; use LWP::Simple 'get','head'; diff --git a/t/00.compile.t b/t/00.compile.t index 3fb6d32bd..91c5d99c1 100644 --- a/t/00.compile.t +++ b/t/00.compile.t @@ -78,7 +78,8 @@ sub skip_file { gbrowse_attach_slaves.pl make_das_conf.pl gbrowse_slave_start_aws.sh - gbrowse_launch_aws_slaves.pl + gbrowse_aws_balancer.pl + gbrowse_sync_aws_slave.pl ); return $skip{ basename($file) }; diff --git a/t/07.balancer.t b/t/07.balancer.t index e3d680a7d..bf862baf1 100755 --- a/t/07.balancer.t +++ b/t/07.balancer.t @@ -15,6 +15,8 @@ BEGIN { use lib "$Bin/../lib"; if (!eval {require Parse::Apache::ServerStatus;1}) { plan skip_all => 'Optional module Parse::Apache::ServerStatus not installed'; + } elsif (!eval "use VM::EC2 1.22; 1") { + plan skip_all => 'Optional module VM::EC2 (v1.22 or higher) not installed'; } else { plan tests => TESTS; } @@ -23,6 +25,7 @@ BEGIN { my $b = Bio::Graphics::Browser2::Render::Slave::AWS_Balancer->new(-conf=>CONF_FILE); $b or BAIL_OUT("Couldn't create balancer"); +$b->verbosity(0); my $instance = $b->running_as_instance; is_deeply([$b->slaves_wanted(0.1)],[0,1],'load table test 1');