Merge pull request #216 from oranenj/tmp_dir

Ensure the module build tmp/ directory is actually a directory
voxpupuli · May 4, 2017 · 0942937 · 0942937
2 parents 394ddfa + 094a47b
commit 0942937
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -129,7 +129,9 @@
     force   => true,
   }
 
-  # created by refpolicy builder and our simple builder
-  # ensure it does not get purged
-  file {"${module_build_dir}/tmp": selinux_ignore_defaults => true }
+  # needed by refpolicy builder and our simple builder
+  file {"${module_build_dir}/tmp":
+    ensure                  => 'directory',
+    selinux_ignore_defaults => true,
+  }
 }
diff --git a/spec/classes/selinux_config_type_spec.rb b/spec/classes/selinux_config_type_spec.rb
@@ -17,6 +17,7 @@
           it { is_expected.to have_exec_resource_count(0) }
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux') }
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/modules') }
+          it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/modules/tmp').with_ensure('directory') }
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/bin/selinux_build_module_simple.sh') }
           it { is_expected.not_to contain_file_line('set-selinux-config-type-to-targeted') }
           it { is_expected.not_to contain_file_line('set-selinux-config-type-to-minimum') }
@@ -27,6 +28,7 @@
 
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux') }
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/modules') }
+          it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/modules/tmp').with_ensure('directory') }
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/bin/selinux_build_module_simple.sh') }
           it { is_expected.to contain_file_line('set-selinux-config-type-to-targeted').with(line: 'SELINUXTYPE=targeted') }
         end
@@ -35,6 +37,7 @@
 
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux') }
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/modules') }
+          it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/modules/tmp').with_ensure('directory') }
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/bin/selinux_build_module_simple.sh') }
           it { is_expected.to contain_file_line('set-selinux-config-type-to-minimum').with(line: 'SELINUXTYPE=minimum') }
         end
@@ -44,6 +47,7 @@
 
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux') }
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/modules') }
+          it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/modules/tmp').with_ensure('directory') }
           it { is_expected.to contain_file('/var/lib/puppet/puppet-selinux/bin/selinux_build_module_simple.sh') }
           it { is_expected.to contain_file_line('set-selinux-config-type-to-mls').with(line: 'SELINUXTYPE=mls') }
         end