Merge "Fix selinux tests"

This commit is contained in:
Jenkins 2015-11-03 07:51:37 +00:00 committed by Gerrit Code Review
commit db5ac675f2
2 changed files with 6 additions and 6 deletions

View File

@ -201,12 +201,12 @@ describe 'puppet-cgit module', :if => ['fedora', 'redhat'].include?(os[:family])
end
describe command("semanage port -l | grep '^http_port_t'") do
its (:stdout) { should match(/^http_port_t.*\b80,/) }
its (:stdout) { should match(/^http_port_t.*\b443,/) }
its (:stdout) { should match(/^http_port_t.*\b80/) }
its (:stdout) { should match(/^http_port_t.*\b443/) }
end
describe command("semanage port -l | grep '^git_port_t'") do
its(:stdout) { should match(/^git_port_t.*\b9418,/) }
its(:stdout) { should match(/^git_port_t.*\b9418/) }
end
end
end

View File

@ -194,12 +194,12 @@ describe 'puppet-cgit module begind proxy', :if => ['fedora', 'redhat'].include?
describe 'selinux' do
describe command("semanage port -l | grep '^http_port_t'") do
its(:stdout) { should match(/^http_port_t.*\b8080,/) }
its(:stdout) { should match(/^http_port_t.*\b4443,/) }
its(:stdout) { should match(/^http_port_t.*\b8080/) }
its(:stdout) { should match(/^http_port_t.*\b4443/) }
end
describe command("semanage port -l | grep '^git_port_t'") do
its(:stdout) { should match(/^git_port_t.*\b29418,/) }
its(:stdout) { should match(/^git_port_t.*\b29418/) }
end
end
end