@@ -51,7 +51,6 @@ end task :release => [:update_timestamp] - # Generate documentation Rake::RDocTask.new do |rd| rd.main = "Readme.txt" Rakefile @@ -10,10 +10,4 @@ cloud :binary_testing_cloud do listen "8080" has_file :name => "/etc/apache2/apache2.conf" end - - case_of "hostname" do - when_is 'master' do - has_package :name=>'haproxy' - end - end end \ No newline at end of file spec/bin/fixtures/bin_cloud_for_test.rb @@ -81,12 +81,6 @@ describe "ChefResolver" do has_file :name => "/etc/apache2/apache2.conf", :template => "#{::File.dirname(__FILE__)}/../fixtures/test_template.erb", :friends => "bob" has_exec :command => "ls /etc/apache2" end - - case_of "hostname" do - when_is 'master' do - has_package :name=>'haproxy' - end - end end @properties = @cloud.to_properties_hash spec/poolparty/dependency_resolver/chef_resolver_spec.rb @@ -4,6 +4,8 @@ require 'rake/testtask' require 'rake/rdoctask' task :default => [:spec, :test] +desc "Update vendor directory and run tests" +task :ci => ["poolparty:vendor:update", :spec, :test] Spec::Rake::SpecTask.new(:spec) do |t| t.warning = t.rcov = false tasks/spec.rake @@ -72,12 +72,6 @@ class TestPuppetResolver < Test::Unit::TestCase has_file :name => "/etc/apache2/apache2.conf", :template => "#{::File.dirname(__FILE__)}/../../fixtures/test_template.erb", :friends => "bob" has_exec :command => "ls /etc/apache2" end - - case_of "hostname" do - when_is 'master' do - has_package :name=>'haproxy' - end - end end @properties = @cloud.to_properties_hash @@ -92,10 +86,6 @@ class TestPuppetResolver < Test::Unit::TestCase should "should include apache class" do @compiled.should =~ /class apache \{/ end - should "should include the case statement" do - @compiled.should =~ /case \$hostname \{/ - @compiled.should =~ /master : \{/ - end should "should require the file to have the directory (written as file)" do @compiled.should =~ /require => File\[\"\/var\/www\"\]/ end test/poolparty/dependency_resolver/puppet_resolver_test.rb @@ -1 +1 @@ -Subproject commit 3b2309a864208e851818c31bb7810b3ed2258f11 +Subproject commit 3770b5c3dd36ae9953ab5766d7ac1ec311fe1328 vendor/gems/parenting spec/poolparty/services/conditional_spec.rb adb70e36562014cd680e2aca136bdf00bab02374 Ari Lerner arilerner@mac.com http://github.com/auser/poolparty/commit/b9f71c0a68371ca9d4b9aa68aa7483c53c42810d b9f71c0a68371ca9d4b9aa68aa7483c53c42810d 2009-04-30T16:58:30-07:00 2009-04-30T16:58:30-07:00 Fixed specs and tests as well as added rake ci for integrity 768c5e7b2b6b5d438edb85086cce32fbda16d260 Ari Lerner arilerner@mac.com