summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2013-07-26 09:36:29 -0700
committerBryan McLellan <btm@opscode.com>2013-07-26 09:36:29 -0700
commit6dfed013a3c34b21b4417101d48cad3fa096844a (patch)
treeca24864cf39aad370c10275561b4d63cde0128bb
parent0fa3386956e61aa87b2845c805d7ea9ad120a0bf (diff)
downloadchef-6dfed013a3c34b21b4417101d48cad3fa096844a.tar.gz
CHEF-4344: Clean up instances of 'the the' typo.
-rw-r--r--lib/chef/application/windows_service.rb2
-rw-r--r--lib/chef/file_access_control/windows.rb2
-rw-r--r--lib/chef/knife/core/node_presenter.rb2
-rw-r--r--spec/functional/resource/registry_spec.rb2
-rw-r--r--spec/unit/checksum/storage/filesystem_spec.rb2
-rw-r--r--spec/unit/provider/env_spec.rb4
-rw-r--r--spec/unit/provider/group_spec.rb4
-rw-r--r--spec/unit/provider/service/arch_service_spec.rb2
-rw-r--r--spec/unit/provider/service/freebsd_service_spec.rb2
-rw-r--r--spec/unit/provider/service/init_service_spec.rb2
-rw-r--r--spec/unit/provider/service/invokercd_service_spec.rb2
-rw-r--r--spec/unit/provider/service/upstart_service_spec.rb4
-rw-r--r--spec/unit/provider/user_spec.rb2
13 files changed, 16 insertions, 16 deletions
diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb
index 85a18c7a17..e8e2760c1c 100644
--- a/lib/chef/application/windows_service.rb
+++ b/lib/chef/application/windows_service.rb
@@ -241,7 +241,7 @@ class Chef
def configure_chef(startup_parameters)
# Bit of a hack ahead:
# It is possible to specify a service's binary_path_name with arguments, like "foo.exe -x argX".
- # It is also possible to specify startup parameters separately, either via the the Services manager
+ # It is also possible to specify startup parameters separately, either via the Services manager
# or by using the registry (I think).
# In order to accommodate all possible sources of parameterization, we first parse any command line
diff --git a/lib/chef/file_access_control/windows.rb b/lib/chef/file_access_control/windows.rb
index 35a16337ab..32ac2996bd 100644
--- a/lib/chef/file_access_control/windows.rb
+++ b/lib/chef/file_access_control/windows.rb
@@ -220,7 +220,7 @@ class Chef
flags = 0
#
- # Configure child inheritence only if the the resource is some
+ # Configure child inheritence only if the resource is some
# type of a directory.
#
if resource.is_a? Chef::Resource::Directory
diff --git a/lib/chef/knife/core/node_presenter.rb b/lib/chef/knife/core/node_presenter.rb
index a35baf2264..d1aab592ef 100644
--- a/lib/chef/knife/core/node_presenter.rb
+++ b/lib/chef/knife/core/node_presenter.rb
@@ -86,7 +86,7 @@ class Chef
# Converts a Chef::Node object to a string suitable for output to a
# terminal. If config[:medium_output] or config[:long_output] are set
# the volume of output is adjusted accordingly. Uses colors if enabled
- # in the the ui object.
+ # in the ui object.
def summarize(data)
if data.kind_of?(Chef::Node)
node = data
diff --git a/spec/functional/resource/registry_spec.rb b/spec/functional/resource/registry_spec.rb
index fa52640eb7..7662ec7331 100644
--- a/spec/functional/resource/registry_spec.rb
+++ b/spec/functional/resource/registry_spec.rb
@@ -510,7 +510,7 @@ describe Chef::Resource::RegistryKey, :windows_only do
@registry.key_exists?(reg_parent + '\OpscodeTest').should == false
end
- it "raises an exception if the the key has subkeys and recursive == false" do
+ it "raises an exception if the key has subkeys and recursive == false" do
@new_resource.key(reg_parent)
@new_resource.recursive(false)
lambda{@new_resource.run_action(:delete_key)}.should raise_error(Chef::Exceptions::Win32RegNoRecursive)
diff --git a/spec/unit/checksum/storage/filesystem_spec.rb b/spec/unit/checksum/storage/filesystem_spec.rb
index a39644202e..5be345ce4c 100644
--- a/spec/unit/checksum/storage/filesystem_spec.rb
+++ b/spec/unit/checksum/storage/filesystem_spec.rb
@@ -36,7 +36,7 @@ describe Chef::Checksum::Storage::Filesystem do
@storage.file_location.should == "/var/chef/checksums/3f/3fafecfb15585ede6b840158cbc2f399"
end
- it "has the path the the file's subdirectory in the checksum repo" do
+ it "has the path the file's subdirectory in the checksum repo" do
@storage.checksum_repo_directory.should == "/var/chef/checksums/3f"
end
diff --git a/spec/unit/provider/env_spec.rb b/spec/unit/provider/env_spec.rb
index 77aea42b43..673ba9798a 100644
--- a/spec/unit/provider/env_spec.rb
+++ b/spec/unit/provider/env_spec.rb
@@ -81,7 +81,7 @@ describe Chef::Provider::Env do
@provider.action_create
end
- it "should set the the new_resources updated flag when it creates the key" do
+ it "should set the new_resources updated flag when it creates the key" do
@provider.action_create
@new_resource.should be_updated
end
@@ -99,7 +99,7 @@ describe Chef::Provider::Env do
@provider.action_create
end
- it "should set the the new_resources updated flag when it updates an existing value" do
+ it "should set the new_resources updated flag when it updates an existing value" do
@provider.key_exists = true
@provider.stub!(:compare_value).and_return(true)
@provider.stub!(:modify_env).and_return(true)
diff --git a/spec/unit/provider/group_spec.rb b/spec/unit/provider/group_spec.rb
index 106a0db14c..8fceb7428e 100644
--- a/spec/unit/provider/group_spec.rb
+++ b/spec/unit/provider/group_spec.rb
@@ -117,7 +117,7 @@ describe Chef::Provider::User do
@provider.run_action(:create)
end
- it "should set the the new_resources updated flag when it creates the group" do
+ it "should set the new_resources updated flag when it creates the group" do
@provider.group_exists = false
@provider.stub!(:create_group)
@provider.run_action(:create)
@@ -138,7 +138,7 @@ describe Chef::Provider::User do
@provider.run_action(:create)
end
- it "should set the the new_resources updated flag when it creates the group if we call manage_group" do
+ it "should set the new_resources updated flag when it creates the group if we call manage_group" do
@provider.group_exists = true
@provider.stub!(:compare_group).and_return(true)
@provider.stub!(:manage_group).and_return(true)
diff --git a/spec/unit/provider/service/arch_service_spec.rb b/spec/unit/provider/service/arch_service_spec.rb
index a7afa28da1..42e7868600 100644
--- a/spec/unit/provider/service/arch_service_spec.rb
+++ b/spec/unit/provider/service/arch_service_spec.rb
@@ -62,7 +62,7 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
@provider.load_current_resource
end
- it "should set running to true if the the status command returns 0" do
+ it "should set running to true if the status command returns 0" do
@provider.stub!(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 0))
@provider.load_current_resource
@provider.current_resource.running.should be_true
diff --git a/spec/unit/provider/service/freebsd_service_spec.rb b/spec/unit/provider/service/freebsd_service_spec.rb
index 6dd06bde2c..72e896a16b 100644
--- a/spec/unit/provider/service/freebsd_service_spec.rb
+++ b/spec/unit/provider/service/freebsd_service_spec.rb
@@ -88,7 +88,7 @@ RC_SAMPLE
@provider.load_current_resource
end
- it "should set running to true if the the status command returns 0" do
+ it "should set running to true if the status command returns 0" do
@provider.should_receive(:shell_out).with("/usr/local/etc/rc.d/#{@current_resource.service_name} status").and_return(@status)
@current_resource.should_receive(:running).with(true)
@provider.load_current_resource
diff --git a/spec/unit/provider/service/init_service_spec.rb b/spec/unit/provider/service/init_service_spec.rb
index 650fca8320..4131ee61a8 100644
--- a/spec/unit/provider/service/init_service_spec.rb
+++ b/spec/unit/provider/service/init_service_spec.rb
@@ -61,7 +61,7 @@ PS
@provider.load_current_resource
end
- it "should set running to true if the the status command returns 0" do
+ it "should set running to true if the status command returns 0" do
@provider.stub!(:shell_out).with("/etc/init.d/#{@current_resource.service_name} status").and_return(@status)
@provider.load_current_resource
@current_resource.running.should be_true
diff --git a/spec/unit/provider/service/invokercd_service_spec.rb b/spec/unit/provider/service/invokercd_service_spec.rb
index ace2ad24e3..798b987dd5 100644
--- a/spec/unit/provider/service/invokercd_service_spec.rb
+++ b/spec/unit/provider/service/invokercd_service_spec.rb
@@ -61,7 +61,7 @@ PS
@provider.load_current_resource
end
- it "should set running to true if the the status command returns 0" do
+ it "should set running to true if the status command returns 0" do
@provider.stub!(:shell_out).with("/usr/sbin/invoke-rc.d #{@current_resource.service_name} status").and_return(@status)
@provider.load_current_resource
@current_resource.running.should be_true
diff --git a/spec/unit/provider/service/upstart_service_spec.rb b/spec/unit/provider/service/upstart_service_spec.rb
index 4604d1b697..4224b229e5 100644
--- a/spec/unit/provider/service/upstart_service_spec.rb
+++ b/spec/unit/provider/service/upstart_service_spec.rb
@@ -97,7 +97,7 @@ describe Chef::Provider::Service::Upstart do
before do
end
- it "should set running to true if the the status command returns 0" do
+ it "should set running to true if the status command returns 0" do
@stdout = StringIO.new("rsyslog start/running")
@provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
@provider.load_current_resource
@@ -113,7 +113,7 @@ describe Chef::Provider::Service::Upstart do
end
describe "when the status command uses the old format" do
- it "should set running to true if the the status command returns 0" do
+ it "should set running to true if the status command returns 0" do
@stdout = StringIO.new("rsyslog (start) running, process 32225")
@provider.stub!(:popen4).and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
@provider.load_current_resource
diff --git a/spec/unit/provider/user_spec.rb b/spec/unit/provider/user_spec.rb
index 9c4e2847f7..0b3d000b4b 100644
--- a/spec/unit/provider/user_spec.rb
+++ b/spec/unit/provider/user_spec.rb
@@ -261,7 +261,7 @@ describe Chef::Provider::User do
@provider.action_create
end
- it "should set the the new_resources updated flag when it creates the user if we call manage_user" do
+ it "should set the new_resources updated flag when it creates the user if we call manage_user" do
@provider.user_exists = true
@provider.stub!(:compare_user).and_return(true)
@provider.stub!(:manage_user).and_return(true)