Merge "Extend coverage of config acceptance tests"

spec/acceptance/99_designate_config_spec.rb

@@ -0,0 +1,128 @@
+require 'spec_helper_acceptance'
+
+describe 'basic designate_config resource' do
+
+  context 'default parameters' do
+
+    it 'should work with no errors' do
+      pp= <<-EOS
+      Exec { logoutput => 'on_failure' }
+
+      File <||> -> Designate_config <||>
+      File <||> -> Designate_api_paste_ini <||>
+      File <||> -> Designate_rootwrap_config <||>
+
+      file { '/etc/designate' :
+        ensure => directory,
+      }
+      file { '/etc/designate/designate.conf' :
+        ensure => file,
+      }
+
+      designate_config { 'DEFAULT/thisshouldexist' :
+        value => 'foo',
+      }
+
+      designate_config { 'DEFAULT/thisshouldnotexist' :
+        value => '<SERVICE DEFAULT>',
+      }
+
+      designate_config { 'DEFAULT/thisshouldexist2' :
+        value             => '<SERVICE DEFAULT>',
+        ensure_absent_val => 'toto',
+      }
+
+      designate_config { 'DEFAULT/thisshouldnotexist2' :
+        value             => 'toto',
+        ensure_absent_val => 'toto',
+      }
+
+      designate_config { 'DEFAULT/thisshouldexist3' :
+        value => ['foo', 'bar'],
+      }
+
+      designate_api_paste_ini { 'DEFAULT/thisshouldexist' :
+        value => 'foo',
+      }
+
+      designate_api_paste_ini { 'DEFAULT/thisshouldnotexist' :
+        value => '<SERVICE DEFAULT>',
+      }
+
+      designate_api_paste_ini { 'DEFAULT/thisshouldexist2' :
+        value             => '<SERVICE DEFAULT>',
+        ensure_absent_val => 'toto',
+      }
+
+      designate_api_paste_ini { 'DEFAULT/thisshouldnotexist2' :
+        value             => 'toto',
+        ensure_absent_val => 'toto',
+      }
+
+      designate_api_paste_ini { 'DEFAULT/thisshouldexist3' :
+        value             => 'foo',
+        key_val_separator => ':'
+      }
+
+      designate_rootwrap_config { 'DEFAULT/thisshouldexist' :
+        value => 'foo',
+      }
+
+      designate_rootwrap_config { 'DEFAULT/thisshouldnotexist' :
+        value => '<SERVICE DEFAULT>',
+      }
+
+      designate_rootwrap_config { 'DEFAULT/thisshouldexist2' :
+        value             => '<SERVICE DEFAULT>',
+        ensure_absent_val => 'toto',
+      }
+
+      designate_rootwrap_config { 'DEFAULT/thisshouldnotexist2' :
+        value             => 'toto',
+        ensure_absent_val => 'toto',
+      }
+      EOS
+
+
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+      apply_manifest(pp, :catch_changes => true)
+    end
+
+    describe file('/etc/designate/designate.conf') do
+      it { is_expected.to exist }
+      it { is_expected.to contain('thisshouldexist=foo') }
+      it { is_expected.to contain('thisshouldexist2=<SERVICE DEFAULT>') }
+      it { is_expected.to contain('thisshouldexist3=foo') }
+      it { is_expected.to contain('thisshouldexist3=bar') }
+
+      describe '#content' do
+        subject { super().content }
+        it { is_expected.to_not match /thisshouldnotexist/ }
+      end
+    end
+
+    describe file('/etc/designate/api-paste.ini') do
+      it { is_expected.to exist }
+      it { is_expected.to contain('thisshouldexist=foo') }
+      it { is_expected.to contain('thisshouldexist2=<SERVICE DEFAULT>') }
+      it { is_expected.to contain('thisshouldexist3:foo') }
+
+      describe '#content' do
+        subject { super().content }
+        it { is_expected.to_not match /thisshouldnotexist/ }
+      end
+    end
+
+    describe file('/etc/designate/rootwrap.conf') do
+      it { is_expected.to exist }
+      it { is_expected.to contain('thisshouldexist=foo') }
+      it { is_expected.to contain('thisshouldexist2=<SERVICE DEFAULT>') }
+
+      describe '#content' do
+        subject { super().content }
+        it { is_expected.to_not match /thisshouldnotexist/ }
+      end
+    end
+  end
+end

spec/acceptance/designate_config_spec.rb

@@ -1,58 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'basic designate_config resource' do
-
-  context 'default parameters' do
-
-    it 'should work with no errors' do
-      pp= <<-EOS
-      Exec { logoutput => 'on_failure' }
-
-      File <||> -> Designate_config <||>
-
-      file { '/etc/designate' :
-        ensure => directory,
-      }
-      file { '/etc/designate/designate.conf' :
-        ensure => file,
-      }
-
-      designate_config { 'DEFAULT/thisshouldexist' :
-        value => 'foo',
-      }
-
-      designate_config { 'DEFAULT/thisshouldnotexist' :
-        value => '<SERVICE DEFAULT>',
-      }
-
-      designate_config { 'DEFAULT/thisshouldexist2' :
-        value             => '<SERVICE DEFAULT>',
-        ensure_absent_val => 'toto',
-      }
-
-      designate_config { 'DEFAULT/thisshouldnotexist2' :
-        value             => 'toto',
-        ensure_absent_val => 'toto',
-      }
-      EOS
-
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    describe file('/etc/designate/designate.conf') do
-      it { is_expected.to exist }
-      it { is_expected.to contain('thisshouldexist=foo') }
-      it { is_expected.to contain('thisshouldexist2=<SERVICE DEFAULT>') }
-
-      describe '#content' do
-        subject { super().content }
-        it { is_expected.to_not match /thisshouldnotexist/ }
-      end
-    end
-
-
-  end
-end