3910-updates'
006f9b17b1c7Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'pcarlisle-ticket/master/3910-updates'

This reflects pull request #691, but is being done by hand because the changes
in this code reveal the weak stubbing performed in other agent tests.

Details

Provenance

Daniel Pittman <daniel@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU85ac3fc01673: (#3910) Add nodes to auth.conf in acceptance tests
rPU6733671030f1: Merge pull request #687 from…

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU006f9b17b1c7: Merge branch 'pcarlisle-ticket/master/3910-updates' (authored by Daniel Pittman <daniel@puppetlabs.com>).Apr 25 2012, 2:28 AM

Merged Changes

85ac3fc01673 (#3910) Add nodes to auth.conf in acceptance tests
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
252516dc87fb Fix file path used in enc acceptance test
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
5a79d9abd96e (#3910) Default to no cache for nodes on master
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
1f5be217b91a (#3910) Give environment as argument to indirection requests
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
c3f8008826e4 Make positional arguments distinct in Request#initialize
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
90f16111ac43 (#3910) Use catalog's environment when fetching file content
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
580c94b61a40 (#3910) Give environment in indirection calls in configurer
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
986bf25159b0 (#3910) Thread environment through plugin downloader
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
70a1c706da6e (#3910) Set environment locally in configurer
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
093a0745b4e9 (#3910) Query node before fetching catalog to determine environment
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
8804e3526231 Clean up the exec indirection terminus
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
3ce7f680ad9e Refactor removing prepare in configurer
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0ecca3212cd7 Rename dostorage to init_storage
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
dcb92850596f (#3910) Use the requested environment of node as default in exec terminus
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
cc5608bc413b (#3910) Add acceptance test for case of enc that doesn't specify environment
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (54)

Path

Size

acceptance/

tests/

allow_arbitrary_node_name_fact_for_agent.rb

allow_arbitrary_node_name_for_agent.rb

environment/

	use_agent_environment_when_enc_doesnt_specify.rb
	use_agent_environment_when_no_enc.rb

use_enc_environment_for_files.rb

lib/

puppet/

application/

configurer/

face/

indirector/

catalog/

node/

node/

ssl/

type/

file/

spec/

integration/

indirector/

catalog/

queue_spec.rb

direct_file_server_spec.rb

node/

facts_spec.rb

node_spec.rb

shared_behaviours/

file_server_terminus.rb

unit/

application/

master_spec.rb

configurer/

plugin_handler_spec.rb

configurer_spec.rb

file_serving/

fileset_spec.rb

indirector/

catalog/

active_record_spec.rb

compiler_spec.rb

certificate/

rest_spec.rb

direct_file_server_spec.rb

facts/

inventory_active_record_spec.rb

inventory_service_spec.rb

file_bucket_file/

file_metadata/

node/

active_record_spec.rb

exec_spec.rb

report/

processor_spec.rb

request_spec.rb

resource/

active_record_spec.rb

resource_type/

parser_spec.rb

rest_spec.rb

run/

local_spec.rb

network/

http/

api/

v1_spec.rb

node_spec.rb

type/

file/

content_spec.rb

source_spec.rb

rPU006f9b17b1c7

View Options

acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb

View Options

acceptance/tests/allow_arbitrary_node_name_for_agent.rb

View Options

acceptance/tests/environment/use_agent_environment_when_enc_doesnt_specify.rb

View Options

acceptance/tests/environment/use_enc_environment_for_files.rb

View Options

lib/puppet/application/agent.rb

View Options

lib/puppet/application/master.rb

View Options

lib/puppet/configurer.rb

View Options

lib/puppet/configurer/downloader.rb

View Options

lib/puppet/configurer/fact_handler.rb

View Options

lib/puppet/configurer/plugin_handler.rb

View Options

lib/puppet/face/ca.rb

View Options

lib/puppet/indirector/catalog/compiler.rb

View Options

lib/puppet/indirector/exec.rb

View Options

lib/puppet/indirector/indirection.rb

View Options

lib/puppet/indirector/node/exec.rb

View Options

lib/puppet/indirector/request.rb

View Options

lib/puppet/node.rb

View Options

lib/puppet/node/facts.rb

View Options

lib/puppet/ssl/host.rb

View Options

lib/puppet/transaction.rb

View Options

lib/puppet/type/file.rb

View Options

lib/puppet/type/file/content.rb

View Options

lib/puppet/type/file/source.rb

View Options

spec/integration/indirector/catalog/queue_spec.rb

View Options

spec/integration/indirector/direct_file_server_spec.rb

View Options

spec/integration/node/facts_spec.rb

View Options

spec/integration/node_spec.rb

View Options

spec/shared_behaviours/file_server_terminus.rb

View Options

spec/unit/application/master_spec.rb

View Options

spec/unit/configurer/plugin_handler_spec.rb

View Options

spec/unit/configurer_spec.rb

View Options

spec/unit/file_serving/fileset_spec.rb

View Options

spec/unit/indirector/catalog/active_record_spec.rb

View Options

spec/unit/indirector/catalog/compiler_spec.rb

View Options

spec/unit/indirector/certificate/rest_spec.rb

View Options

spec/unit/indirector/direct_file_server_spec.rb

View Options

spec/unit/indirector/facts/inventory_active_record_spec.rb

View Options

spec/unit/indirector/facts/inventory_service_spec.rb

View Options

spec/unit/indirector/facts/yaml_spec.rb

View Options

spec/unit/indirector/file_bucket_file/file_spec.rb

View Options

spec/unit/indirector/file_metadata/file_spec.rb

View Options

spec/unit/indirector/indirection_spec.rb

View Options

spec/unit/indirector/node/active_record_spec.rb

View Options

spec/unit/indirector/node/exec_spec.rb

View Options

spec/unit/indirector/report/processor_spec.rb

View Options

spec/unit/indirector/request_spec.rb

View Options

spec/unit/indirector/resource/active_record_spec.rb

View Options

spec/unit/indirector/resource_type/parser_spec.rb

View Options

spec/unit/indirector/rest_spec.rb

View Options

spec/unit/indirector/run/local_spec.rb

View Options

spec/unit/network/http/api/v1_spec.rb

View Options

spec/unit/node_spec.rb

View Options

spec/unit/type/file/content_spec.rb

View Options

spec/unit/type/file/source_spec.rb

Merge branch 'pcarlisle-ticket/master/3910-updates'006f9b17b1c7UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (54)

rPU006f9b17b1c7

acceptance/tests/allow_arbitrary_node_name_fact_for_agent.rb

acceptance/tests/allow_arbitrary_node_name_for_agent.rb

acceptance/tests/environment/use_agent_environment_when_enc_doesnt_specify.rb

acceptance/tests/environment/use_enc_environment_for_files.rb

lib/puppet/application/agent.rb

lib/puppet/application/master.rb

lib/puppet/configurer.rb

lib/puppet/configurer/downloader.rb

lib/puppet/configurer/fact_handler.rb

lib/puppet/configurer/plugin_handler.rb

lib/puppet/face/ca.rb

lib/puppet/indirector/catalog/compiler.rb

lib/puppet/indirector/exec.rb

lib/puppet/indirector/indirection.rb

lib/puppet/indirector/node/exec.rb

lib/puppet/indirector/request.rb

lib/puppet/node.rb

lib/puppet/node/facts.rb

lib/puppet/ssl/host.rb

lib/puppet/transaction.rb

lib/puppet/type/file.rb

lib/puppet/type/file/content.rb

lib/puppet/type/file/source.rb

spec/integration/indirector/catalog/queue_spec.rb

spec/integration/indirector/direct_file_server_spec.rb

spec/integration/node/facts_spec.rb

spec/integration/node_spec.rb

spec/shared_behaviours/file_server_terminus.rb

spec/unit/application/master_spec.rb

spec/unit/configurer/plugin_handler_spec.rb

spec/unit/configurer_spec.rb

spec/unit/file_serving/fileset_spec.rb

spec/unit/indirector/catalog/active_record_spec.rb

spec/unit/indirector/catalog/compiler_spec.rb

spec/unit/indirector/certificate/rest_spec.rb

spec/unit/indirector/direct_file_server_spec.rb

spec/unit/indirector/facts/inventory_active_record_spec.rb

spec/unit/indirector/facts/inventory_service_spec.rb

spec/unit/indirector/facts/yaml_spec.rb

spec/unit/indirector/file_bucket_file/file_spec.rb

spec/unit/indirector/file_metadata/file_spec.rb

spec/unit/indirector/indirection_spec.rb

spec/unit/indirector/node/active_record_spec.rb

spec/unit/indirector/node/exec_spec.rb

spec/unit/indirector/report/processor_spec.rb

spec/unit/indirector/request_spec.rb

spec/unit/indirector/resource/active_record_spec.rb

spec/unit/indirector/resource_type/parser_spec.rb

spec/unit/indirector/rest_spec.rb

spec/unit/indirector/run/local_spec.rb

spec/unit/network/http/api/v1_spec.rb

spec/unit/node_spec.rb

spec/unit/type/file/content_spec.rb

spec/unit/type/file/source_spec.rb

Merge branch 'pcarlisle-ticket/master/3910-updates'
006f9b17b1c7Unpublished
Actions