Skip to content

Commit 545e229

Browse files
author
Daniel Carabas
committed
Fix git clone repo acceptance tests
1 parent 8374050 commit 545e229

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

spec/acceptance/clone_repo_spec.rb

+7-16
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
require 'spec_helper_acceptance'
44

55
tmpdir = '/tmp/vcsrepo'
6+
homedir = '/root/' #set as /root/ for acceptance testing on containers
67

78
describe 'clones a remote repo' do
89
before(:all) do
@@ -470,31 +471,21 @@
470471

471472
context 'with using an identity file' do
472473
before(:all) do
473-
# create user
474-
pp = <<-MANIFEST
475-
user { 'testuser-ssh':
476-
ensure => present,
477-
managehome => true,
478-
}
479-
MANIFEST
480-
apply_manifest(pp, catch_failures: true)
481-
482474
# create ssh keys
483-
run_shell('mkdir -p /home/testuser-ssh/.ssh')
484-
run_shell('ssh-keygen -q -t rsa -f /home/testuser-ssh/.ssh/id_rsa -N ""')
475+
run_shell("mkdir -p #{homedir}/.ssh")
476+
run_shell("ssh-keygen -q -t rsa -f #{homedir}/.ssh/id_rsa -N ''")
485477

486478
# copy public key to authorized_keys
487-
run_shell('cat /home/testuser-ssh/.ssh/id_rsa.pub > /home/testuser-ssh/.ssh/authorized_keys')
488-
run_shell('echo -e "Host localhost\n\tStrictHostKeyChecking no\n" > /home/testuser-ssh/.ssh/config')
489-
run_shell('chown -R testuser-ssh:testuser-ssh /home/testuser-ssh/.ssh')
479+
run_shell("cat #{homedir}/.ssh/id_rsa.pub > #{homedir}/.ssh/authorized_keys")
480+
run_shell("echo -e \"Host localhost\\n\\tStrictHostKeyChecking no\\n\" > #{homedir}/.ssh/config")
490481
end
491482

492483
pp = <<-MANIFEST
493484
vcsrepo { "#{tmpdir}/testrepo_user_ssh_id":
494485
ensure => present,
495486
provider => git,
496-
source => "testuser-ssh@localhost:#{tmpdir}/testrepo.git",
497-
identity => '/home/testuser-ssh/.ssh/id_rsa',
487+
source => "root@localhost:#{tmpdir}/testrepo.git",
488+
identity => '#{homedir}/.ssh/id_rsa',
498489
}
499490
MANIFEST
500491
it 'applies the manifest' do

0 commit comments

Comments
 (0)