@@ -25,76 +25,54 @@
     @new_resource = Chef::Resource::Package.new('cups')
     @current_resource = Chef::Resource::Package.new('cups')
     @status = mock("Status", :exitstatus => 0)
-		@yum_cache = mock(
-			'Chef::Provider::Yum::YumCache',
-			:refresh => true,
-			:flush => true,
-		  :installed_version => "1.2.4-11.18.el5",
-		  :candidate_version => "1.2.4-11.18.el5_2.3"
-		)
-		Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
+    @yum_cache = mock(
+      'Chef::Provider::Yum::YumCache',
+      :refresh => true,
+      :flush => true,
+      :installed_version => "1.2.4-11.18.el5",
+      :candidate_version => "1.2.4-11.18.el5_2.3"
+    )
+    Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
     @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
     Chef::Resource::Package.stub!(:new).and_return(@current_resource)
     @stderr = mock("STDERR", :null_object => true)
     @pid = mock("PID", :null_object => true)
   end
-  
+
   describe "when loading the current system state" do
-  
+
     it "should create a current resource with the name of the new_resource" do
       Chef::Resource::Package.should_receive(:new).and_return(@current_resource)
       @provider.load_current_resource
     end
-  
+
     it "should set the current resources package name to the new resources package name" do
       @current_resource.should_receive(:package_name).with(@new_resource.package_name)
       @provider.load_current_resource
     end
-  
+
     it "should set the installed version to nil on the current resource if no installed package" do
-  		@yum_cache.stub!(:installed_version).and_return(nil)
+      @yum_cache.stub!(:installed_version).and_return(nil)
       @current_resource.should_receive(:version).with(nil).and_return(true)
       @provider.load_current_resource
     end
-  
+
     it "should set the installed version if yum has one" do
       @current_resource.should_receive(:version).with("1.2.4-11.18.el5").and_return(true)
       @provider.load_current_resource
     end
-  
+
     it "should set the candidate version if yum info has one" do
       @provider.load_current_resource
       @provider.candidate_version.should eql("1.2.4-11.18.el5_2.3")
     end
-  
+
     it "should return the current resouce" do
       @provider.load_current_resource.should eql(@current_resource)
     end
   end
 
   describe Chef::Provider::Package::Yum, "install_package" do
-  
-    # before(:each) do
-    #   @node = Chef::Node.new
-    #   @new_resource = mock("Chef::Resource::Package",
-    #     :null_object => true,
-    #     :name => "emacs",
-    #     :version => nil,
-    #     :package_name => "emacs",
-    #     :updated => nil,
-    #     :source => nil
-    #   )
-  	# 	@yum_cache = mock(
-  	# 		'Chef::Provider::Yum::YumCache',
-  	# 		:refresh => true,
-  	# 		:flush => true,
-  	# 	  :installed_version => "1.2.4-11.18.el5",
-  	# 	  :candidate_version => "1.2.4-11.18.el5_2.3"
-  	# 	)
-  	# 	Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
-    #   @provider = Chef::Provider::Package::Yum.new(@node, @new_resource)
-    # end
-  
     it "should run yum install with the package name and version" do
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "yum -d0 -e0 -y  install emacs-1.0"
@@ -110,6 +88,14 @@
       @provider.install_package("emacs", "21.4-20.el5")
     end
 
+    it "should run yum install with the package name, version and arch" do
+      @new_resource.stub!(:arch).and_return("i386")
+      @provider.should_receive(:run_command_with_systems_locale).with({
+        :command => "yum -d0 -e0 -y install emacs-21.4-20.el5.i386"
+      })
+      @provider.install_package("emacs", "21.4-20.el5")
+    end
+
   end
 
   describe Chef::Provider::Package::Yum, "upgrade_package" do
@@ -119,15 +105,23 @@
       })
       @provider.upgrade_package(@new_resource.name, nil)
     end
-  
+
+    it "should run yum update with arch if the package is installed and no version is given" do
+      @new_resource.stub!(:arch).and_return("i386")
+      @provider.should_receive(:run_command_with_systems_locale).with({
+        :command => "yum -d0 -e0 -y update cups.i386"
+      })
+      @provider.upgrade_package(@new_resource.name, nil)
+    end
+
     it "should run yum install if the package is installed and a version is given" do
       @provider.candidate_version = '11'
       @provider.should_receive(:run_command_with_systems_locale).with({
         :command => "yum -d0 -e0 -y  install cups-11"
       })
       @provider.upgrade_package(@new_resource.name, @provider.candidate_version)
     end
- 
+
     it "should run yum install if the package is not installed" do
       @provider.candidate_version = '11'
       @current_resource.stub!(:version).and_return(nil)
@@ -146,6 +140,14 @@
       })
       @provider.remove_package("emacs", "1.0")
     end
+
+    it "should run yum remove with the package name and arch" do
+      @new_resource.stub!(:arch).and_return("x86_64")
+      @provider.should_receive(:run_command_with_systems_locale).with({
+        :command => "yum -d0 -e0 -y remove emacs-1.0.x86_64"
+      })
+      @provider.remove_package("emacs", "1.0")
+    end
   end
 
   describe Chef::Provider::Package::Yum, "purge_package" do
 
@@ -37,4 +37,13 @@
   end
 end
 
+describe Chef::Resource::YumPackage, "arch" do
+  before(:each) do
+    @resource = Chef::Resource::YumPackage.new("foo")
+  end
 
+  it "should set the arch variable to whatever is passed in" do
+    @resource.arch("i386")
+    @resource.arch.should eql("i386")
+  end
+end