diff --git a/lib/beaker/hypervisor/vagrant.rb b/lib/beaker/hypervisor/vagrant.rb index 6ef295f..42a3d09 100644 --- a/lib/beaker/hypervisor/vagrant.rb +++ b/lib/beaker/hypervisor/vagrant.rb @@ -291,7 +291,7 @@ def self.cpus(host, options) elsif options['vagrant_cpus'] options['vagrant_cpus'] else - '1' + '2' end end @@ -300,10 +300,8 @@ def self.memsize(host, options) host['vagrant_memsize'] elsif options['vagrant_memsize'] options['vagrant_memsize'] - elsif /windows/.match?(host['platform']) - '2048' else - '1024' + '2048' end end diff --git a/spec/beaker/vagrant_desktop_spec.rb b/spec/beaker/vagrant_desktop_spec.rb index d0db72a..4dd1869 100644 --- a/spec/beaker/vagrant_desktop_spec.rb +++ b/spec/beaker/vagrant_desktop_spec.rb @@ -28,7 +28,7 @@ end it 'for a set of hosts' do - expect(subject).to include(%( v.vm.provider :vmware_desktop do |v|\n v.vmx['memsize'] = '1024'\n end)) + expect(subject).to include(%( v.vm.provider :vmware_desktop do |v|\n v.vmx['memsize'] = '2048'\n end)) end context 'with whitelist_verified' do diff --git a/spec/beaker/vagrant_fusion_spec.rb b/spec/beaker/vagrant_fusion_spec.rb index 8efc8bf..87505ea 100644 --- a/spec/beaker/vagrant_fusion_spec.rb +++ b/spec/beaker/vagrant_fusion_spec.rb @@ -26,7 +26,7 @@ end it 'has a provider section' do - expect(subject).to include(%( v.vm.provider :vmware_fusion do |v|\n v.vmx['memsize'] = '1024'\n end)) + expect(subject).to include(%( v.vm.provider :vmware_fusion do |v|\n v.vmx['memsize'] = '2048'\n end)) end end end diff --git a/spec/beaker/vagrant_libvirt_spec.rb b/spec/beaker/vagrant_libvirt_spec.rb index 79b2274..90ef455 100644 --- a/spec/beaker/vagrant_libvirt_spec.rb +++ b/spec/beaker/vagrant_libvirt_spec.rb @@ -45,7 +45,7 @@ end it 'can specify the memory as an integer' do - expect(subject).to include('node.memory = 1024') + expect(subject).to include('node.memory = 2048') end it 'can specify the number of cpus' do diff --git a/spec/beaker/vagrant_parallels_spec.rb b/spec/beaker/vagrant_parallels_spec.rb index 782df63..11e9b35 100644 --- a/spec/beaker/vagrant_parallels_spec.rb +++ b/spec/beaker/vagrant_parallels_spec.rb @@ -26,7 +26,7 @@ end it 'can make a Vagrantfile for a set of hosts' do - expect(subject).to include(%( v.vm.provider :parallels do |prl|\n prl.optimize_power_consumption = false\n prl.memory = '1024'\n end)) + expect(subject).to include(%( v.vm.provider :parallels do |prl|\n prl.optimize_power_consumption = false\n prl.memory = '2048'\n end)) end end diff --git a/spec/beaker/vagrant_spec.rb b/spec/beaker/vagrant_spec.rb index c7ea008..3c4d172 100644 --- a/spec/beaker/vagrant_spec.rb +++ b/spec/beaker/vagrant_spec.rb @@ -56,7 +56,7 @@ module Beaker v.vm.network :forwarded_port, guest: 443, host: 4443 v.vm.network :forwarded_port, guest: 8080, host: 8080 v.vm.provider :virtualbox do |vb| - vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none'] + vb.customize ['modifyvm', :id, '--memory', '2048', '--cpus', '2', '--audio', 'none'] end end c.vm.define 'vm2' do |v| @@ -71,7 +71,7 @@ module Beaker v.vm.network :forwarded_port, guest: 443, host: 4443 v.vm.network :forwarded_port, guest: 8080, host: 8080 v.vm.provider :virtualbox do |vb| - vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none'] + vb.customize ['modifyvm', :id, '--memory', '2048', '--cpus', '2', '--audio', 'none'] end end c.vm.define 'vm3' do |v| @@ -86,7 +86,7 @@ module Beaker v.vm.network :forwarded_port, guest: 443, host: 4443 v.vm.network :forwarded_port, guest: 8080, host: 8080 v.vm.provider :virtualbox do |vb| - vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none'] + vb.customize ['modifyvm', :id, '--memory', '2048', '--cpus', '2', '--audio', 'none'] end end end @@ -264,7 +264,7 @@ module Beaker generated_file = File.read(File.expand_path(File.join(path, 'Vagrantfile'))) - match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!', '--cpus', '1', '--audio', 'none'\]/) + match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!', '--cpus', '2', '--audio', 'none'\]/) expect(match).not_to be_nil end @@ -276,7 +276,7 @@ module Beaker generated_file = File.read(File.expand_path(File.join(path, 'Vagrantfile'))) - match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '1024', '--cpus', 'goodbye!', '--audio', 'none'\]/) + match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '2048', '--cpus', 'goodbye!', '--audio', 'none'\]/) expect(match).not_to be_nil end