[Puppet-dev] (puppetlabs/puppet) (Maint) Consistently use the same agent fqdn

[wearetherobots]

Please review pull request #581: (Maint) Consistently use the same agent fqdn opened by (joshcooper)

Description:

Previously, the test would always fail when the rhel6-32-1 box was
reverted to its git snapshot, and the test executed. The box, for
better or worse, reports the following:

[root@rhel6-32-1 ~]# hostname -f
rhel6-32-1
[root@rhel6-32-1 ~]# facter fqdn
rhel6-32-1.puppetlabs.lan


The agent submits its report using the latter, but the test attempts to
retrieve the facts using the former:

curl -k -H \"Accept: yaml\" https://rhel6-32-1:8140/override/facts/`hostname -f`"


And that always fails:

Could not find facts rhel6-32-1


This issue does not occur when running the non-Windows acceptance tests,
because those jobs run on centos-55-386-1 and ubuntu-1004-32-1, which
don't have inconsistency in their domain as reported by facter andhostname -f

This commit changes the test to request the facts from the master using
the same fqdn that the agent used in its report.

    
      Opened: Thu Mar 15 03:32:12 UTC 2012
        Based on: puppetlabs:2.7.x (e1a49621b34e468b975e5cb1e0e88e6bf47d3e08)
        Requested merge: joshcooper:maint/2.7.x/fix-fqdn-rendezvous (43003f5b6a62dd598e81d4babe90396b77289b8d)
    

    Diff follows:
    diff --git a/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb b/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb
index 5bace08..1bca72c 100644
--- a/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb
+++ b/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb
@@ -23,9 +23,10 @@
     # Run test on Agents
     step "Run agent to upload facts"
     on agent, puppet_agent("--test --server #{master}")
+    fqdn = on(agent, facter("fqdn")).stdout
 
     step "Fetch agent facts from Puppet Master"
-    on(agent, "curl -k -H \"Accept: yaml\" https://#{master}:8140/override/facts/\`hostname -f\`") do
+    on(agent, "curl -k -H \"Accept: yaml\" https://#{master}:8140/override/facts/#{fqdn}") do
       assert_match(/--- !ruby\/object:Puppet::Node::Facts/, stdout, "Agent Facts not returned for #{agent}")
     end
   end

    
  




-- 
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com.

For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.