[COOK-3125] Use default instead of normal attribute for python bin

kamaradclimber · sethvargo · commit ed1d192e5103 · 2013-08-24T14:18:08.000-04:00
Signed-off-by: Seth Vargo &lt;sethvargo@gmail.com&gt;
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -26,7 +26,7 @@ platforms:
   driver_config:
     box: opscode-centos-5.9
     box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box
- 
+
 - name: centos-6.4
   driver_config:
     box: opscode-centos-6.4
@@ -49,6 +49,6 @@ suites:
   - recipe[python_test::test_exert]
 - name: virtualenv
   excludes: ["centos-5.9"]
-  run_list: 
+  run_list:
   - recipe[python]
   - recipe[python_test::test_virtualenv]
diff --git a/Berksfile b/Berksfile
@@ -7,4 +7,4 @@ group :integration do
   cookbook "yum"
   cookbook "build-essential"
   cookbook "python_test", :path => "./test/cookbooks/python_test"
-end
+end
diff --git a/recipes/package.rb b/recipes/package.rb
@@ -25,7 +25,7 @@
 if platform_family?('rhel') && major_version < 6
   include_recipe 'yum::epel'
   python_pkgs = ["python26", "python26-devel"]
-  node.set['python']['binary'] = "/usr/bin/python26"
+  node.default['python']['binary'] = "/usr/bin/python26"
 else
   python_pkgs = value_for_platform_family(
                   "debian" => ["python","python-dev"],
diff --git a/test/cookbooks/python_test/recipes/test_exert.rb b/test/cookbooks/python_test/recipes/test_exert.rb
@@ -33,4 +33,3 @@
 python_pip "psutil" do
   action :install
 end
-
diff --git a/test/integration/exert/bats/exert.bats b/test/integration/exert/bats/exert.bats
@@ -11,4 +11,3 @@
 @test "virtualenv test environment should have boto working" {
     /tmp/kitchen-chef-solo/cache/virtualenv/bin/python -c 'import boto; boto.Version'
 }
-

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,3 @@`
`11`	`11`	`@test "virtualenv test environment should have boto working" {`
`12`	`12`	`/tmp/kitchen-chef-solo/cache/virtualenv/bin/python -c 'import boto; boto.Version'`
`13`	`13`	`}`
`14`		`-`