Skip to content

EPEL only makes sense on RH systems but not Fedora #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ghoneycutt merged 5 commits into from
Dec 8, 2016
Merged

EPEL only makes sense on RH systems but not Fedora #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40f33b9
EPEL only makes sense on RH systems but not Fedora
jcpunk Apr 11, 2016
a24ecb8
Merge remote-tracking branch 'upstream/master' into epel-rhonly
jcpunk May 4, 2016
80b8663
Updated documentation, added test
jcpunk May 11, 2016
d420237
Merge remote-tracking branch 'upstream/master' into epel-rhonly
jcpunk Aug 24, 2016
30167d2
updated tests: is RHEL has EPEL, is Fedora no EPEL, is RPM based but …
jcpunk Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Installs and manages python, python-pip, python-dev, python-virtualenv and Gunic

**manage_gunicorn** - Allow Installation / Removal of Gunicorn. Default: true

**use_epel** - Boolean to determine if the epel class is used. Default: true
**use_epel** - Boolean to determine if the epel class is used. Default: true on RHEL like systems, false otherwise

```puppet
class { 'python' :
Expand Down
11 changes: 10 additions & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,16 @@
'Debian' => ['3', '3.3', '2.7'],
'Suse' => [],
}
$use_epel = true

if $::osfamily == 'RedHat' {
if $::operatingsystem != 'Fedora' {
$use_epel = true
} else {
$use_epel = false
}
} else {
$use_epel = false
}

$gunicorn_package_name = $::osfamily ? {
'RedHat' => 'python-gunicorn',
Expand Down
41 changes: 41 additions & 0 deletions spec/classes/python_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,37 @@
it { is_expected.to contain_package("python-dev").with_ensure('absent') }
end
end

describe "EPEL does not exist for Debian" do
context "default/empty" do
Copy link
Copy Markdown
Member

@ghoneycutt ghoneycutt Sep 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to set the facts with values for osfamily and operatingsystem. Will need three different tests to correspond with the code in params.

describe 'epel class' do
  context 'when osfamily is RedHat and operatingsystem is Fedora' do
    ...
  end
  context 'when osfamily is RedHat and operatingsystem is Fedora' do
    ...
  end
  context 'when osfamily is RedHat and operatingsystem is not Fedora' do
    ...
  end
  context 'when osfamily is not RedHat' do
    ...
  end
end

to set the facts, it would look like this

context 'whatever' do
  let(:facts) do
    {
      :osfamily        => 'RedHat',
      :operatingsystem => 'Fedora',
    }
end

it { should_not contain_class('epel') }
end
end

end

context "on a Fedora 22 OS" do
let :facts do
{
:id => 'root',
:kernel => 'Linux',
:osfamily => 'RedHat',
:operatingsystem => 'Fedora',
:operatingsystemrelease => '22',
:concat_basedir => '/dne',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
}
end

describe "EPEL does not exist for Fedora" do
context "default/empty" do
it { should_not contain_class('epel') }
end
end

end


context "on a Redhat 5 OS" do
let :facts do
{
Expand All @@ -112,6 +141,12 @@
# Basic python packages (from pip)
it { is_expected.to contain_package("virtualenv")}

describe "EPEL may be needed on EL" do
context "default/empty" do
it { should contain_class('epel') }
end
end

describe "with python::dev" do
context "true" do
let (:params) {{ :dev => 'present' }}
Expand Down Expand Up @@ -271,5 +306,11 @@
it { is_expected.to contain_package("python-dev").with_ensure('absent') }
end
end

describe "EPEL does not exist on Suse" do
context "default/empty" do
it { should_not contain_class('epel') }
end
end
end
end