Merge lp:~racb/ubuntu/saucy/puppet/dep8-hiera into lp:ubuntu/saucy/puppet

[Robie Basak]

d/tests/hiera: add dep8 test for hiera functionality

d/tests/hiera: add dep8 test for hiera functionality

[Robie Basak (racb)]

I'm concerned about uploading this now, because of https://lists.ubuntu.com/archives/ubuntu-quality/2013-July/004018.html

[lp:~racb/ubuntu/saucy/puppet/dep8-hiera]

71. By Robie Basak on 2014-01-22

Make hiera test "set -x" and mark test "allow-stderr"

72. By Robie Basak on 2014-01-22

Enable puppet agent, as it is now disabled by default.

Unmerged revisions

72. By Robie Basak on 2014-01-22

Enable puppet agent, as it is now disabled by default.

71. By Robie Basak on 2014-01-22

Make hiera test "set -x" and mark test "allow-stderr"

70. By Robie Basak on 2013-07-05

d/tests/hiera: add dep8 test for hiera functionality.

69. By Stig Sandbeck Mathisen on 2013-06-19

* New upstream version (Closes: #712745, CVE-2013-3567)
  - use packaged ruby-safe-yaml instead of the vendored gem
* Support apache 2.4 (Closes: #675409)
* Remove dependency on rails (Closes: #709636)
* Remove build dependency on ruby-rspec
* add dep8 tests
* puppetmaster-passenger.postinst: check if puppet.conf can be parsed on
  install.
  Thanks to Ubuntu

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-03 16:39:37 +0000
+++ debian/changelog	2014-01-22 14:00:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 puppet (3.2.4-2ubuntu2) saucy; urgency=low
 
   * debian/tests/control: invert order of tests, or else puppet-agent runs
@@ -43,6 +44,14 @@
 
  -- Stig Sandbeck Mathisen <[e-mail]>  Fri, 02 Aug 2013 23:07:48 +0200
 
+=======
+puppet (3.2.2-1ubuntu1) UNRELEASED; urgency=low
+
+  * d/tests/hiera: add dep8 test for hiera functionality.
+
+ -- Robie Basak <[e-mail]>  Tue, 02 Jul 2013 14:44:41 +0000
+
+>>>>>>> MERGE-SOURCE
 puppet (3.2.2-1) unstable; urgency=high
 
   * New upstream version (Closes: #712745, CVE-2013-3567)

=== modified file 'debian/control'
=== modified file 'debian/tests/control'
--- debian/tests/control	2013-09-03 16:39:37 +0000
+++ debian/tests/control	2014-01-22 14:00:20 +0000
@@ -5,3 +5,7 @@
 Tests: puppetmaster-passenger
 Depends: puppetmaster-passenger
 Restrictions: needs-root
+
+Tests: hiera
+Depends: puppet, puppetmaster
+Restrictions: needs-root allow-stderr

=== added file 'debian/tests/hiera'
--- debian/tests/hiera	1970-01-01 00:00:00 +0000
+++ debian/tests/hiera	2014-01-22 14:00:20 +0000
@@ -0,0 +1,65 @@
+#!/bin/sh
+set -ex
+
+# Author: Robie Basak <[e-mail]>
+
+# For now, since we use the same machine for the agent and the master, both of
+# these are this machine itself. This test is written so that we can split
+# the test into separate agent and master parts in the future.
+
+# "facter fqdn" writes some warnings to stderr if "hostname -f" fails, and this
+# causes the test to fail. So ignore those. This isn't great for debugging, but
+# that's why I think dep8 should consider stderr writes to be failures.
+
+master_name=`facter fqdn 2>/dev/null`
+agent_name=$master_name
+
+prepare_agent() {
+	cat >> /etc/puppet/puppet.conf <<EOT
+[agent]
+server=$master_name
+EOT
+}
+
+prepare_master() {
+	cat > /etc/puppet/hiera.yaml <<EOT
+---
+:backends:
+  - yaml
+:yaml:
+  :datadir: /etc/puppet/hiera
+:hierarchy:
+  - '%{::fqdn}'
+  - common
+EOT
+
+	mkdir /etc/puppet/hiera
+	cat > /etc/puppet/hiera/${agent_name}.yaml <<EOT
+---
+dep8::content: "success\n"
+EOT
+
+	cat > /etc/puppet/manifests/site.pp <<EOT
+class dep8(\$content) { file { '/tmp/dep8-result': content => \$content } }
+node '$agent_name' {
+	include dep8
+}
+EOT
+}
+
+prepare_master
+prepare_agent
+
+puppet agent --enable
+
+# The next command tends to return non-zero on success, so ignore it and just
+# check that it did what it was supposed to later.
+puppet agent --test || true # run on the agent
+
+# XXX the following aren't needed when running the agent and the master on the
+# same system.
+# puppet cert sign $agent_name # run on the master
+# puppet agent --test # run on the agent
+
+# Now /tmp/dep8-result should be "success\n" on the agent.
+echo success|cmp - /tmp/dep8-result