diff options
| author | sersut <serdar@opscode.com> | 2013-05-14 11:49:16 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2013-05-14 11:49:16 -0700 |
| commit | eef83d8ab5943af1dd3b25ccc94ef71d772d945a (patch) | |
| tree | f1e3125e4ba6fdcfb08e0f5114758f0524494112 /spec/data | |
| parent | 564ac7a3761fd870eb867b985b01273510115cf2 (diff) | |
| parent | 664ee74decc3b069269b4f079a3e7a86613b0af1 (diff) | |
| download | chef-eef83d8ab5943af1dd3b25ccc94ef71d772d945a.tar.gz | |
Merge branch 'master' into file-refactor
Conflicts:
spec/unit/knife/configure_spec.rb
spec/unit/provider/remote_file_spec.rb
Diffstat (limited to 'spec/data')
| -rw-r--r-- | spec/data/bootstrap/encrypted_data_bag_secret | 1 | ||||
| -rw-r--r-- | spec/data/bootstrap/secret.erb | 9 | ||||
| -rw-r--r-- | spec/data/knife_subcommand/test_yourself.rb | 8 | ||||
| -rw-r--r-- | spec/data/lwrp_const_scoping/resources/conflict.rb | 0 |
4 files changed, 18 insertions, 0 deletions
diff --git a/spec/data/bootstrap/encrypted_data_bag_secret b/spec/data/bootstrap/encrypted_data_bag_secret new file mode 100644 index 0000000000..ac88558a1a --- /dev/null +++ b/spec/data/bootstrap/encrypted_data_bag_secret @@ -0,0 +1 @@ +supersekret_from_file diff --git a/spec/data/bootstrap/secret.erb b/spec/data/bootstrap/secret.erb new file mode 100644 index 0000000000..e0ad41576d --- /dev/null +++ b/spec/data/bootstrap/secret.erb @@ -0,0 +1,9 @@ +bash -c ' +<% if encrypted_data_bag_secret -%> +awk NF > /etc/chef/encrypted_data_bag_secret <<'EOP' +<%= encrypted_data_bag_secret %> +EOP +chmod 0600 /etc/chef/encrypted_data_bag_secret +<% end -%> + +<%= config_content %>' diff --git a/spec/data/knife_subcommand/test_yourself.rb b/spec/data/knife_subcommand/test_yourself.rb index 4b3f6b039c..f18f565885 100644 --- a/spec/data/knife_subcommand/test_yourself.rb +++ b/spec/data/knife_subcommand/test_yourself.rb @@ -1,6 +1,14 @@ module KnifeSpecs class TestYourself < Chef::Knife + class << self + attr_reader :test_deps_loaded + end + + deps do + @test_deps_loaded = true + end + option :scro, :short => '-s SCRO', :long => '--scro SCRO', :description => 'a configurable setting' attr_reader :ran diff --git a/spec/data/lwrp_const_scoping/resources/conflict.rb b/spec/data/lwrp_const_scoping/resources/conflict.rb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/spec/data/lwrp_const_scoping/resources/conflict.rb |