Skip to content

Commit 6acf94c

Browse files
authored
Merge pull request #767 from rodjek/acceptance_1_8_7
Change acceptance tests to work with Ruby 1.8.7
2 parents 0799152 + 3d4d192 commit 6acf94c

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

lib/puppet-lint/tasks/release_test.rb

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
require 'rake'
22
require 'open3'
3+
require 'English'
34

45
def run_cmd(message, *cmd)
5-
print(" #{message}...")
6+
print(" #{message}... ")
7+
8+
if Open3.respond_to?(:capture2e)
9+
output, status = Open3.capture2e(*cmd)
10+
else
11+
output = ''
12+
13+
Open3.popen3(*cmd) do |stdin, stdout, stderr|
14+
stdin.close
15+
output += stdout.read
16+
output += stderr.read
17+
end
18+
status = $CHILD_STATUS.dup
19+
end
620

7-
output, status = Open3.capture2e(*cmd)
821
if status.success?
922
puts 'Done'
1023
else

0 commit comments

Comments
 (0)