diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-16 14:50:39 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-16 14:50:39 -0800 |
| commit | cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4 (patch) | |
| tree | 2be10cd07b1c8c45d63ec38adb7f35927841b864 /spec/unit/application | |
| parent | 52ca8c78c270b93ce997217900a3d333ad8154cc (diff) | |
| parent | b4035315aaad37df97d4e620b4f972cad201d04f (diff) | |
| download | puppet-cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4.tar.gz puppet-cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4.tar.xz puppet-cc1f2b39a65e8b74c8e59a2bf7d8f47a35985ee4.zip | |
Merge branch '2.6.next' into 2.6.x
* 2.6.next:
maint: Fix ActiveRecord confine issue
maint: Fix a test that was missing a require
maint: Fix tests that don't run on their own
Diffstat (limited to 'spec/unit/application')
| -rwxr-xr-x | spec/unit/application/agent_spec.rb | 1 | ||||
| -rw-r--r-- | spec/unit/application/filebucket_spec.rb | 1 | ||||
| -rwxr-xr-x | spec/unit/application/queue_spec.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/spec/unit/application/agent_spec.rb b/spec/unit/application/agent_spec.rb index 54726c185..ff504eedf 100755 --- a/spec/unit/application/agent_spec.rb +++ b/spec/unit/application/agent_spec.rb @@ -5,6 +5,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' require 'puppet/agent' require 'puppet/application/agent' require 'puppet/network/server' +require 'puppet/network/handler' require 'puppet/daemon' describe Puppet::Application::Agent do diff --git a/spec/unit/application/filebucket_spec.rb b/spec/unit/application/filebucket_spec.rb index 6e7a7b819..e6272f179 100644 --- a/spec/unit/application/filebucket_spec.rb +++ b/spec/unit/application/filebucket_spec.rb @@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' require 'puppet/application/filebucket' +require 'puppet/file_bucket/dipper' describe Puppet::Application::Filebucket do before :each do diff --git a/spec/unit/application/queue_spec.rb b/spec/unit/application/queue_spec.rb index 87c96dfff..bd0d53ab1 100755 --- a/spec/unit/application/queue_spec.rb +++ b/spec/unit/application/queue_spec.rb @@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' require 'puppet/application/queue' +require 'puppet/indirector/catalog/queue' describe Puppet::Application::Queue do before :each do |