diff options
author | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-05-27 16:02:58 -0400 |
---|---|---|
committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-05-27 16:02:58 -0400 |
commit | bc29a94ad26070c0b1d0e1dd6f6fca7eaf0120f9 (patch) | |
tree | 8da22df25e149a27aa06b00709eab97a2a3286f6 /spec | |
parent | d98e0083f33f76e1ad13b650df81bdb18e4b59fe (diff) | |
parent | 521d321181c95eb042c23c8277e79cfe1d066117 (diff) |
Merge pull request #151 from hunner/fix_trusty
Update tests for ubuntu 14.04
Diffstat (limited to 'spec')
-rw-r--r-- | spec/acceptance/beaker_helper.rb | 6 | ||||
-rwxr-xr-x | spec/acceptance/files/create_git_repo.sh | 4 | ||||
-rw-r--r-- | spec/spec_helper_acceptance.rb | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/spec/acceptance/beaker_helper.rb b/spec/acceptance/beaker_helper.rb index 2bf663b..262cb62 100644 --- a/spec/acceptance/beaker_helper.rb +++ b/spec/acceptance/beaker_helper.rb @@ -14,5 +14,11 @@ test_name "Installing Puppet and vcsrepo module" do # Waiting on release of puppet_module_install in beaker #puppet_module_install(:source => proj_root, :module_name => 'vcsrepo') scp_to(hosts, proj_root, File.join(hosts.first['distmoduledir'], 'vcsrepo')) + gitconfig = <<-EOS +[user] + email = root@localhost + name = root +EOS + create_remote_file(host, "/root/.gitconfig", script) end end diff --git a/spec/acceptance/files/create_git_repo.sh b/spec/acceptance/files/create_git_repo.sh index 40f341a..b5e930c 100755 --- a/spec/acceptance/files/create_git_repo.sh +++ b/spec/acceptance/files/create_git_repo.sh @@ -6,12 +6,12 @@ touch file1.txt file2.txt file3.txt git init echo 'change 1' > file1.txt git add file1.txt -git tag 0.0.1 git commit -m 'add file1' +git tag 0.0.1 echo 'change 2' > file2.txt git add file2.txt -git tag 0.0.2 git commit -m 'add file2' +git tag 0.0.2 echo 'change 3' > file3.txt git add file3.txt git commit -m 'add file3' diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index dec9331..d0d84d0 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -34,6 +34,8 @@ RSpec.configure do |c| exit end end + shell('git config --global user.email "root@localhost"') + shell('git config --global user.name "root"') end end end |