beaker 2.33.0 → 2.34.0

data/spec/beaker/host/pswindows/exec_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+module Beaker
+  describe PSWindows::Exec do
+    class PSWindowsExecTest
+      include PSWindows::Exec
+
+      def initialize(hash, logger)
+        @hash = hash
+        @logger = logger
+      end
+
+      def [](k)
+        @hash[k]
+      end
+
+      def to_s
+        "me"
+      end
+
+    end
+
+    let (:opts)     { @opts || {} }
+    let (:logger)   { double( 'logger' ).as_null_object }
+    let (:instance) { PSWindowsExecTest.new(opts, logger) }
+
+    context "rm" do
+
+      it "deletes" do
+        path = '/path/to/delete'
+        corrected_path = '\\path\\to\\delete'
+        expect( instance ).to receive(:execute).with("del /s /q #{corrected_path}").and_return(0)
+        expect( instance.rm_rf(path) ).to be === 0
+      end
+    end
+
+    context 'mv' do
+      let(:origin)      { '/origin/path/of/content' }
+      let(:destination) { '/destination/path/of/content' }
+
+      it 'rm first' do
+        expect( instance ).to receive(:execute).with("del /s /q #{destination.gsub(/\//, '\\')}").and_return(0)
+        expect( instance ).to receive(:execute).with("move /y #{origin.gsub(/\//, '\\')} #{destination.gsub(/\//, '\\')}").and_return(0)
+        expect( instance.mv(origin, destination) ).to be === 0
+
+      end
+
+      it 'does not rm' do
+        expect( instance ).to receive(:execute).with("move /y #{origin.gsub(/\//, '\\')} #{destination.gsub(/\//, '\\')}").and_return(0)
+        expect( instance.mv(origin, destination, false) ).to be === 0
+      end
+    end
+  end
+end

data/spec/beaker/host/pswindows/user_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+class PSWindowsUserTest
+  include PSWindows::User
+end
+
+describe PSWindowsUserTest do
+  let( :wmic_output ) do <<-EOS
+
+
+
+
+Name=Administrator
+
+
+
+
+
+Name=bob foo
+
+
+
+
+
+Name=bob-dash
+
+
+
+
+
+Name=bob.foo
+
+
+
+
+
+Name=cyg_server
+
+
+
+
+
+
+
+
+EOS
+  end
+  let( :command )  { 'cmd /c echo "" | wmic useraccount where localaccount="true" get name /format:value' }
+  let( :host ) { double.as_null_object }
+  let( :result ) { Beaker::Result.new( host, command ) }
+
+  describe '#user_list' do
+
+    it 'returns user names list correctly' do
+      result.stdout = wmic_output
+      expect( subject ).to receive( :execute ).with( command ).and_yield(result)
+      expect( subject.user_list ).to be === ['Administrator', 'bob foo', 'bob-dash', 'bob.foo', 'cyg_server']
+    end
+
+    it 'yields correctly with the result object' do
+      result.stdout = wmic_output
+      expect( subject ).to receive( :execute ).and_yield(result)
+      subject.user_list { |result|
+        expect( result.stdout ).to be === wmic_output
+      }
+    end
+
+  end
+
+end

data/spec/beaker/host/unix/exec_spec.rb

@@ -50,6 +50,25 @@ module Beaker
       end
     end
 
+    describe '#environment_string' do
+      let(:host) { {'pathseparator' => ':'} }
+
+      it 'returns a blank string if theres no env' do
+        expect( instance ).to receive( :is_powershell? ).never
+        expect( instance.environment_string( {} ) ).to be == ''
+      end
+
+      it 'takes an env hash with var_name/value pairs' do
+        expect( instance.environment_string( {:HOME => '/'} ) ).
+          to be == "env HOME=\"/\""
+      end
+
+      it 'takes an env hash with var_name/value[Array] pairs' do
+        expect( instance.environment_string( {:LD_PATH => ['/', '/tmp']}) ).
+          to be == "env LD_PATH=\"/:/tmp\""
+      end
+    end
+
     describe '#ssh_permit_user_environment' do
       it 'raises an error on unsupported platforms' do
         opts['platform'] = 'notarealthing01-parts-arch'
@@ -67,5 +86,16 @@ module Beaker
         }.to raise_error( ArgumentError, /#{opts['platform']}/ )
       end
     end
+
+    describe '#prepend_commands' do
+
+      it 'returns the pc parameter unchanged for non-cisco platforms' do
+        allow( instance ).to receive( :[] ).with( :platform ).and_return( 'notcisco' )
+        answer_prepend_commands = 'pc_param_unchanged_13579'
+        answer_test = instance.prepend_commands( 'fake_cmd', answer_prepend_commands )
+        expect( answer_test ).to be === answer_prepend_commands
+      end
+
+    end
   end
 end

data/spec/beaker/host/unix/file_spec.rb

@@ -102,18 +102,25 @@ module Beaker
 
       it 'builds the filename correctly for debian-based platforms' do
         @platform = 'debian-8-x86_64'
-        filename = instance.repo_filename( 'pkg_name', 'pkg_version9' )
-        correct = 'pl-pkg_name-pkg_version9-jessie.list'
+        filename = instance.repo_filename( 'pkg_name', 'pkg_version10' )
+        correct = 'pl-pkg_name-pkg_version10-jessie.list'
         expect( filename ).to be === correct
       end
 
       it 'uses the variant for the codename on the cumulus platform' do
         @platform = 'cumulus-2.5-x86_64'
-        filename = instance.repo_filename( 'pkg_name', 'pkg_version10' )
-        correct = 'pl-pkg_name-pkg_version10-cumulus.list'
+        filename = instance.repo_filename( 'pkg_name', 'pkg_version11' )
+        correct = 'pl-pkg_name-pkg_version11-cumulus.list'
         expect( filename ).to be === correct
       end
 
+      it 'adds wrlinux to variant on cisco platforms' do
+        @platform = 'cisco-5-x86_64'
+        allow( instance ).to receive( :is_pe? ) { false }
+        filename = instance.repo_filename( 'pkg_name', 'pkg_version12' )
+        expect( filename ).to match( /sion12\-cisco\-wrlinux\-/ )
+      end
+
       it 'errors for non-el or debian-based platforms' do
         @platform = 'freebsd-22-x86_64'
         expect {

data/spec/beaker/host/unix/pkg_spec.rb

@@ -142,7 +142,6 @@ module Beaker
         expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
         expect( instance.install_package(pkg) ).to be == "hello"
       end
-
     end
 
     context "install_package_with_rpm" do

data/spec/beaker/host/unix_spec.rb

@@ -204,5 +204,14 @@ module Unix
         expect( host.determine_ssh_server ).to be === :openssh
       end
     end
+
+    describe '#validate_setup' do
+
+      it 'does nothing for non cisco-5 platforms' do
+        @platform = 'el-7-x86_64'
+        validate_test = host.validate_setup
+        expect( validate_test ).to be_nil
+      end
+    end
   end
 end

data/spec/beaker/host/windows/exec_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 module Beaker
-  describe PSWindows::Exec do
-    class PSWindowsExecTest
-      include PSWindows::Exec
+  describe Windows::Exec do
+    class WindowsExecTest
+      include Windows::Exec
 
       def initialize(hash, logger)
         @hash = hash
@@ -22,32 +22,25 @@ module Beaker
 
     let (:opts)     { @opts || {} }
     let (:logger)   { double( 'logger' ).as_null_object }
-    let (:instance) { PSWindowsExecTest.new(opts, logger) }
+    let (:instance) { WindowsExecTest.new(opts, logger) }
 
-    context "rm" do
-
-      it "deletes" do
-        path = '/path/to/delete'
-        corrected_path = '\\path\\to\\delete'
-        expect( instance ).to receive(:execute).with("del /s /q #{corrected_path}").and_return(0)
-        expect( instance.rm_rf(path) ).to be === 0
+    describe '#prepend_commands' do
+      it 'sets spacing correctly if both parts are defined' do
+        allow( instance ).to receive( :is_cygwin? ).and_return( true )
+        command_str = instance.prepend_commands( 'command', 'pants', { :cmd_exe => true } )
+        expect( command_str ).to be === 'cmd.exe /c pants'
       end
-    end
-
-    context 'mv' do
-      let(:origin)      { '/origin/path/of/content' }
-      let(:destination) { '/destination/path/of/content' }
-
-      it 'rm first' do
-        expect( instance ).to receive(:execute).with("del /s /q #{destination.gsub(/\//, '\\')}").and_return(0)
-        expect( instance ).to receive(:execute).with("move /y #{origin.gsub(/\//, '\\')} #{destination.gsub(/\//, '\\')}").and_return(0)
-        expect( instance.mv(origin, destination) ).to be === 0
 
+      it 'sets spacing empty if one is not supplied' do
+        allow( instance ).to receive( :is_cygwin? ).and_return( true )
+        command_str = instance.prepend_commands( 'command', 'pants' )
+        expect( command_str ).to be === 'pants'
       end
 
-      it 'does not rm' do
-         expect( instance ).to receive(:execute).with("move /y #{origin.gsub(/\//, '\\')} #{destination.gsub(/\//, '\\')}").and_return(0)
-         expect( instance.mv(origin, destination, false) ).to be === 0
+      it 'does not use cmd.exe by default' do
+        allow( instance ).to receive( :is_cygwin? ).and_return( true )
+        command_str = instance.prepend_commands( 'pants' )
+        expect( command_str ).not_to match( /cmd\.exe/ )
       end
     end
   end

data/spec/beaker/host/windows/user_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+class WindowsUserTest
+  include Windows::User
+end
+
+describe WindowsUserTest do
+  let( :wmic_output ) do <<-EOS
+
+
+
+
+Name=Administrator
+
+
+
+
+
+Name=bob foo
+
+
+
+
+
+Name=bob-dash
+
+
+
+
+
+Name=bob.foo
+
+
+
+
+
+Name=cyg_server
+
+
+
+
+
+
+
+
+EOS
+  end
+  let( :command )  { 'cmd /c echo "" | wmic useraccount where localaccount="true" get name /format:value' }
+  let( :host ) { double.as_null_object }
+  let( :result ) { Beaker::Result.new( host, command ) }
+
+  describe '#user_list' do
+
+    it 'returns user names list correctly' do
+      result.stdout = wmic_output
+      expect( subject ).to receive( :execute ).with( command ).and_yield(result)
+      expect( subject.user_list ).to be === ['Administrator', 'bob foo', 'bob-dash', 'bob.foo', 'cyg_server']
+    end
+
+    it 'yields correctly with the result object' do
+      result.stdout = wmic_output
+      expect( subject ).to receive( :execute ).and_yield(result)
+      subject.user_list { |result|
+        expect( result.stdout ).to be === wmic_output
+      }
+    end
+
+  end
+
+end

data/spec/beaker/host_spec.rb

@@ -423,6 +423,27 @@ module Beaker
         host.do_scp_to *args
       end
 
+      it 'calls for host scp post operations after SCPing happens' do
+        create_files(['source'])
+        logger = host[:logger]
+        conn = double(:connection)
+        @options = { :logger => logger }
+        host.instance_variable_set :@connection, conn
+        args = [ '/source', 'target', {} ]
+        conn_args = args + [ nil ]
+
+        allow( logger ).to receive(:trace)
+        expect( conn ).to receive(:scp_to).ordered.with(
+          *conn_args
+        ).and_return(Beaker::Result.new(host, 'output!'))
+        allow( conn ).to receive(:ip).and_return(host['ip'])
+        allow( conn ).to receive(:vmhostname).and_return(host['vmhostname'])
+        allow( conn ).to receive(:hostname).and_return(host.name)
+        expect( host ).to receive( :scp_post_operations ).ordered
+
+        host.do_scp_to *args
+      end
+
       it 'throws an IOError when the file given doesn\'t exist' do
         expect { host.do_scp_to "/does/not/exist", "does/not/exist/over/there", {} }.to raise_error(IOError)
       end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -203,6 +203,41 @@ module Beaker
         docker.provision
       end
 
+      it 'should create a container with volumes bound' do
+        hosts.each_with_index do |host, index|
+          host['mount_folders'] = {
+            'mount1' => {
+              'host_path' => '/source_folder',
+              'container_path' => '/mount_point',
+            },
+            'mount2' => {
+              'host_path' => '/another_folder',
+              'container_path' => '/another_mount',
+              'opts' => 'ro',
+            },
+            'mount3' => {
+              'host_path' => '/different_folder',
+              'container_path' => '/different_mount',
+              'opts' => 'rw',
+            },
+          }
+
+          expect( ::Docker::Container ).to receive(:create).with({
+            'Image' => image.id,
+            'Hostname' => host.name,
+            'HostConfig' => {
+              'Binds' => [
+                '/source_folder:/mount_point',
+                '/another_folder:/another_mount:ro',
+                '/different_folder:/different_mount:rw',
+              ]
+            }
+          })
+        end
+
+        docker.provision
+      end
+
       it 'should start the container' do
         expect( container ).to receive(:start).with({'PublishAllPorts' => true, 'Privileged' => true})
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.33.0
+  version: 2.34.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -535,7 +535,9 @@ files:
 - docs/Access-the-Live-Test-Console-with-Pry.md
 - docs/Argument-Processing-and-Precedence.md
 - docs/Beaker-Installation.md
+- docs/Beaker-Libraries.md
 - docs/Beaker-Owners-and-Reviewers.md
+- docs/Beaker-Recipes.md
 - docs/Beaker-Test-Tagging.md
 - docs/Beaker-with-Masterless-Puppet.md
 - docs/Creating-A-Test-Environment.md
@@ -561,6 +563,7 @@ files:
 - docs/Vagrant-Support.md
 - docs/beaker-vs.-beaker-rspec.md
 - docs/hosts/README.md
+- docs/hosts/cisco.md
 - docs/hosts/eos.md
 - docs/hypervisors/README.md
 - docs/hypervisors/aws.md
@@ -601,6 +604,7 @@ files:
 - lib/beaker/host/aix/file.rb
 - lib/beaker/host/aix/group.rb
 - lib/beaker/host/aix/user.rb
+- lib/beaker/host/cisco.rb
 - lib/beaker/host/eos.rb
 - lib/beaker/host/freebsd.rb
 - lib/beaker/host/freebsd/exec.rb
@@ -699,12 +703,15 @@ files:
 - spec/beaker/dsl/structure_spec.rb
 - spec/beaker/dsl/wrappers_spec.rb
 - spec/beaker/host/aix_spec.rb
+- spec/beaker/host/cisco_spec.rb
 - spec/beaker/host/eos_spec.rb
 - spec/beaker/host/freebsd/exec_spec.rb
 - spec/beaker/host/freebsd/pkg_spec.rb
 - spec/beaker/host/mac/group_spec.rb
 - spec/beaker/host/mac/user_spec.rb
 - spec/beaker/host/mac_spec.rb
+- spec/beaker/host/pswindows/exec_spec.rb
+- spec/beaker/host/pswindows/user_spec.rb
 - spec/beaker/host/pswindows_spec.rb
 - spec/beaker/host/unix/exec_spec.rb
 - spec/beaker/host/unix/file_spec.rb
@@ -713,6 +720,7 @@ files:
 - spec/beaker/host/windows/exec_spec.rb
 - spec/beaker/host/windows/group_spec.rb
 - spec/beaker/host/windows/pkg_spec.rb
+- spec/beaker/host/windows/user_spec.rb
 - spec/beaker/host/windows_spec.rb
 - spec/beaker/host_prebuilt_steps_spec.rb
 - spec/beaker/host_spec.rb