Skip to content

Commit 41db534

Browse files
committed
PE-38219 - Installer - Windows as Jump host support - testing
1 parent 5b124da commit 41db534

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

plans/util/retrieve_and_upload.pp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
path => $local_path,
4141
)
4242
}
43+
44+
$result_size = run_task('peadm::filesize', 'local://localhost',
45+
path => $local_path,
46+
)
47+
$local_size = $result_size['size']
4348
} else {
4449
$exists = without_default_logging() || {
4550
run_command("test -e '${local_path}'", 'local://localhost',
@@ -52,14 +57,7 @@
5257
path => $local_path,
5358
)
5459
}
55-
}
5660

57-
if os_string == 'windows' {
58-
$result_size = run_task('peadm::filesize', 'local://localhost',
59-
path => $local_path,
60-
)
61-
$local_size = $result_size['size']
62-
} else {
6361
$local_size = run_task('peadm::filesize', 'local://localhost',
6462
path => $local_path,
6563
).first['size']

spec/plans/util/retrieve_and_upload_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
include BoltSpec::Plans
66

77
it 'file needs downloaded and needs uploaded' do
8+
expect_task('peadm::os_identification')
89
expect_command("test -e '/tmp/download'").error_with('kind' => 'nope', 'msg' => 'The command failed with exit code 1')
910
expect_task('peadm::download')
1011
expect_task('peadm::filesize').be_called_times(2).return_for_targets(

0 commit comments

Comments
 (0)