beaker-pe 1.40.5 → 1.40.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f3dfc737c0733b694f0e90688ad1ea579bce74a8
4
- data.tar.gz: b3359e1711e60d6fe7244d5ae09424140fef3504
3
+ metadata.gz: edf4454eb72e4e157d8744b59bea5e83d6513797
4
+ data.tar.gz: f0077deaf7ecd87f425c2a387ce7501e4fae9ce5
5
5
  SHA512:
6
- metadata.gz: 99e45b8fda8ccddf3fe6d2305041bba748c8c19ff3d679a0d00c3634ef0c5223c3d4293638441d225f5e2fcea7655db322347721d9fb8bb285230fd56534f76f
7
- data.tar.gz: b87a2b68f1a7f89fbf0a4c425b4b5d92262c1486b8483acfe2d79377674dea52bcac1235dddf90b7e8a477431d83556ebbe761f60ee96d8557fd24e0dc35e8df
6
+ metadata.gz: f311516f1bac907bef3cc6670c5aa1ae41bbe1d607d85fb1f123da10f595da5473031d8edca206a917fe29bade42a309d353b22cfee6caba23e96ede51bd9d0b
7
+ data.tar.gz: ceea7a29a4ef52016d1625d692611aeca8a981763d8883bcadf105da6e712ee28382b789fb6bcc4e5094a7dcccc4666a9b0bf8ce4aeb7a8a1b544ad159340235
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
20
20
  # Testing dependencies
21
21
  s.add_development_dependency 'rspec', '~> 3.0'
22
22
  s.add_development_dependency 'rspec-its'
23
- s.add_development_dependency 'fakefs', '~> 0.6'
23
+ s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
24
24
  s.add_development_dependency 'rake', '~> 10.1'
25
25
  s.add_development_dependency 'simplecov'
26
26
  s.add_development_dependency 'pry', '~> 0.10'
@@ -129,6 +129,13 @@ module Beaker
129
129
  downloadhost
130
130
  end
131
131
 
132
+ #Remove client_datadir on the host
133
+ #@param [Host] the host
134
+ def remove_client_datadir(host)
135
+ client_datadir = host.puppet['client_datadir']
136
+ on(host, "rm -rf #{client_datadir}")
137
+ end
138
+
132
139
  # Generate the command line string needed to from a frictionless puppet-agent
133
140
  # install on this host in a PE environment.
134
141
  #
@@ -807,8 +814,7 @@ module Beaker
807
814
  end
808
815
  #Workaround for windows frictionless install, see BKR-943 for the reason
809
816
  if (host['platform'] =~ /windows/) and (host['roles'].include? 'frictionless')
810
- client_datadir = host.puppet['client_datadir']
811
- on(host , puppet("resource file \"#{client_datadir}\" ensure=absent force=true"))
817
+ remove_client_datadir(host)
812
818
  end
813
819
  end
814
820
  end
@@ -1841,8 +1847,7 @@ module Beaker
1841
1847
 
1842
1848
  #Workaround for windows frictionless install, see BKR-943
1843
1849
  agent_nodes.select {|agent| agent['platform'] =~ /windows/}.each do |agent|
1844
- client_datadir = agent.puppet['client_datadir']
1845
- on(agent, puppet("resource file \"#{client_datadir}\" ensure=absent force=true"))
1850
+ remove_client_datadir(agent)
1846
1851
  end
1847
1852
  end
1848
1853
  end
@@ -3,7 +3,7 @@ module Beaker
3
3
  module PE
4
4
 
5
5
  module Version
6
- STRING = '1.40.5'
6
+ STRING = '1.40.6'
7
7
  end
8
8
 
9
9
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-pe
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.40.5
4
+ version: 1.40.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-05-04 00:00:00.000000000 Z
11
+ date: 2018-06-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
@@ -45,6 +45,9 @@ dependencies:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0.6'
48
+ - - "<"
49
+ - !ruby/object:Gem::Version
50
+ version: 0.14.0
48
51
  type: :development
49
52
  prerelease: false
50
53
  version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
52
55
  - - "~>"
53
56
  - !ruby/object:Gem::Version
54
57
  version: '0.6'
58
+ - - "<"
59
+ - !ruby/object:Gem::Version
60
+ version: 0.14.0
55
61
  - !ruby/object:Gem::Dependency
56
62
  name: rake
57
63
  requirement: !ruby/object:Gem::Requirement