beaker 1.10.0 → 1.11.0

data/spec/beaker/hypervisor/docker_spec.rb

@@ -0,0 +1,212 @@
+require 'spec_helper'
+
+# fake the docker-api
+module Docker
+  class Image
+  end
+  class Container
+  end
+end
+
+module Beaker
+  describe Docker do
+    let(:hosts) { make_hosts }
+
+    let(:logger) do
+      logger = double('logger')
+      logger.stub(:debug)
+      logger.stub(:info)
+      logger.stub(:warn)
+      logger.stub(:error)
+      logger.stub(:notify)
+      logger
+    end
+
+    let(:image) do
+      image = double('Docker::Image')
+      image.stub(:id)
+      image.stub(:tag)
+      image.stub(:delete)
+      image
+    end
+
+    let(:container) do
+      container = double('Docker::Container')
+      container.stub(:id)
+      container.stub(:start)
+      container.stub(:json).and_return({
+        'NetworkSettings' => {
+          'Ports' => {
+            '22/tcp' => [
+              {
+                'HostIp' => '127.0.1.1',
+                'HostPort' => 8022,
+              },
+            ],
+          },
+        },
+      })
+      container.stub(:stop)
+      container.stub(:delete)
+      container
+    end
+
+    let (:docker) { ::Beaker::Docker.new( hosts, { :logger => logger }) }
+
+    before :each do
+      # Stub out all of the docker-api gem. we should never really call it
+      # from these tests
+      ::Beaker::Docker.any_instance.stub(:require).with('docker')
+      ::Docker.stub(:options=)
+      ::Docker.stub(:logger=)
+      ::Docker.stub(:validate_version!)
+      ::Docker::Image.stub(:build).and_return(image)
+      ::Docker::Container.stub(:create).and_return(container)
+      ::Docker::Container.any_instance.stub(:start)
+    end
+
+    describe '#initialize' do
+      it 'should require the docker gem' do
+        ::Beaker::Docker.any_instance.should_receive(:require).with('docker').once
+
+        docker
+      end
+
+      it 'should fail when the gem is absent' do
+        ::Beaker::Docker.any_instance.stub(:require).with('docker').and_raise(LoadError)
+        expect { docker }.to raise_error(LoadError)
+      end
+
+      it 'should set Docker options' do
+        ::Docker.should_receive(:options=).once
+
+        docker
+      end
+
+      it 'should check the Docker gem can work with the api' do
+        ::Docker.should_receive(:validate_version!).once
+
+        docker
+      end
+
+      it 'should hook the Beaker logger into the Docker one' do
+        ::Docker.should_receive(:logger=).with(logger)
+
+        docker
+      end
+    end
+
+    describe '#provision' do
+      before :each do
+        docker.stub(:dockerfile_for)
+      end
+
+      it 'should call dockerfile_for with all the hosts' do
+        hosts.each do |host|
+          docker.should_receive(:dockerfile_for).with(host).and_return('')
+        end
+
+        docker.provision
+      end
+
+      it 'should pass the Dockerfile on to Docker::Image.create' do
+        docker.stub(:dockerfile_for).and_return('special testing value')
+        ::Docker::Image.should_receive(:build).with('special testing value', { :rm => true })
+
+        docker.provision
+      end
+
+      it 'should tag the Image with the host.name' do
+        hosts.each do |host|
+          image.should_receive(:tag).with({
+            :repo => host.name,
+            :force => true,
+          })
+        end
+
+        docker.provision
+      end
+
+      it 'should create a container based on the Image (identified by host.name)' do
+        hosts.each do |host|
+          ::Docker::Container.should_receive(:create).with({
+            'Image' => host.name,
+            'Hostname' => host.name,
+          })
+        end
+
+        docker.provision
+      end
+
+      it 'should start the container' do
+        container.should_receive(:start).with({'PublishAllPorts' => true})
+
+        docker.provision
+      end
+
+      it 'should expose port 22 to beaker' do
+        docker.provision
+
+        hosts[0]['ip'].should == '127.0.1.1'
+        hosts[0]['port'].should == 8022
+      end
+
+      it 'should record the image and container for later' do
+        docker.provision
+
+        hosts[0]['docker_image'].should == image
+        hosts[0]['docker_container'].should == container
+      end
+    end
+
+    describe '#cleanup' do
+      before :each do
+        # get into a state where there's something to clean
+        docker.stub(:dockerfile_for)
+        docker.provision
+      end
+
+      it 'should stop the containers' do
+        container.should_receive(:stop)
+        docker.cleanup
+      end
+
+      it 'should delete the containers' do
+        container.should_receive(:delete)
+        docker.cleanup
+      end
+
+      it 'should delete the images' do
+        image.should_receive(:delete)
+        docker.cleanup
+      end
+    end
+
+    describe '#dockerfile_for' do
+      it 'should raise on an unsupported platform' do
+        expect { docker.send(:dockerfile_for, {'platform' => 'a_sidewalk' }) }.to raise_error(/platform a_sidewalk not yet supported on docker/)
+      end
+
+      it 'should add docker_image_commands as RUN statements' do
+        dockerfile = docker.send(:dockerfile_for, {
+          'platform' => 'el-',
+          'docker_image_commands' => [
+            'special one',
+            'special two',
+            'special three',
+          ]
+        })
+
+        dockerfile.should =~ /RUN special one\nRUN special two\nRUN special three/
+      end
+
+      it 'should use zypper on sles' do
+        dockerfile = docker.send(:dockerfile_for, {
+          'platform' => 'sles',
+        })
+
+        dockerfile.should =~ /RUN zypper -n in openssh/
+      end
+    end
+  end
+end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -91,7 +91,8 @@ module Beaker
         host = @hosts[0]
         host[:platform] = 'windows'
 
-        Command.should_receive( :new ).with("sudo su -c \"cp -r .ssh /home/Administrator/.\"").once
+        Command.should_receive( :new ).with("cp -r .ssh /cygdrive/c/Users/Administrator/.").once
+        Command.should_receive( :new ).with("chown -R Administrator /cygdrive/c/Users/Administrator/.ssh").once
 
         vagrant.copy_ssh_to_root( host, options )
 

data/spec/beaker/options/parser_spec.rb

@@ -132,11 +132,10 @@ module Beaker
 
       it "can correctly combine arguments from different sources" do
         FakeFS.deactivate!
-        build_url = ENV["BUILD_URL"]
         ENV["BUILD_URL"] = "http://my.build.url/"
+        build_url = ENV["BUILD_URL"]
         args = ["-h", hosts_path, "--log-level", "debug", "--type", "git", "--install", "PUPPET/1.0,HIERA/hello"]
-        expect(parser.parse_args(args)).to be === {:project=>"Beaker", :department=>"#{ENV['USER']}", :validate=>true, :jenkins_build_url=> "http://my.build.url/", :log_level=>"debug", :trace_limit=>10, :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :add_master_entry=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
-        ENV["BUILD_URL"] = build_url
+        expect(parser.parse_args(args)).to be === {:project=>"Beaker", :department=>"#{ENV['USER']}", :validate=>true, :jenkins_build_url=> "http://my.build.url/", :forge_host=>"vulcan-acceptance.delivery.puppetlabs.net", :log_level=>"debug", :trace_limit=>10, :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>'never', :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>'slow', :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :add_master_entry=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :home=>"#{home}", :answers=>{:q_puppet_enterpriseconsole_auth_user_email=>"admin@example.com", :q_puppet_enterpriseconsole_auth_password=>"~!@\#$%^*-/ aZ", :q_puppet_enterpriseconsole_smtp_host=>nil, :q_puppet_enterpriseconsole_smtp_port=>25, :q_puppet_enterpriseconsole_smtp_username=>nil, :q_puppet_enterpriseconsole_smtp_password=>nil, :q_puppet_enterpriseconsole_smtp_use_tls=>"n", :q_verify_packages=>"y", :q_puppetdb_password=>"~!@\#$%^*-/ aZ"}, :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
       end
 
       it "ensures that fail-mode is one of fast/slow" do

data/spec/helpers.rb

@@ -47,7 +47,7 @@ module HostHelpers
   end
 
   def make_opts
-     Beaker::Options::Presets.presets.merge( { :logger => logger, 
+     Beaker::Options::Presets.presets.merge( Beaker::Options::Presets.env_vars ).merge( { :logger => logger, 
                                                :host_config => 'sample.config',
                                                :type => :foss,
                                                :pooling_api => 'http://vcloud.delivery.puppetlabs.net/',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.38'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -349,6 +363,7 @@ files:
 - lib/beaker/hypervisor/aixer.rb
 - lib/beaker/hypervisor/aws_sdk.rb
 - lib/beaker/hypervisor/blimper.rb
+- lib/beaker/hypervisor/docker.rb
 - lib/beaker/hypervisor/ec2_helper.rb
 - lib/beaker/hypervisor/fusion.rb
 - lib/beaker/hypervisor/google_compute.rb
@@ -396,6 +411,7 @@ files:
 - spec/beaker/hypervisor/aixer_spec.rb
 - spec/beaker/hypervisor/aws_sdk_spec.rb
 - spec/beaker/hypervisor/blimper_spec.rb
+- spec/beaker/hypervisor/docker_spec.rb
 - spec/beaker/hypervisor/ec2_helper_spec.rb
 - spec/beaker/hypervisor/fusion_spec.rb
 - spec/beaker/hypervisor/google_compute.rb
@@ -475,6 +491,7 @@ test_files:
 - spec/beaker/hypervisor/aixer_spec.rb
 - spec/beaker/hypervisor/aws_sdk_spec.rb
 - spec/beaker/hypervisor/blimper_spec.rb
+- spec/beaker/hypervisor/docker_spec.rb
 - spec/beaker/hypervisor/ec2_helper_spec.rb
 - spec/beaker/hypervisor/fusion_spec.rb
 - spec/beaker/hypervisor/google_compute.rb