Merge pull request #539 from mhaskel/lucid_fix

hashes are not supported in selectors
puppetlabs · Jun 17, 2015 · 5dafbd5 · 5dafbd5
2 parents 6dc3b7a + 74bb26d
commit 5dafbd5
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
@@ -11,6 +11,21 @@
   context 'all the things' do
     it 'should work with no errors' do
       pp = <<-EOS
+      if $::lsbdistcodename == 'lucid' {
+        $sources = undef
+      } else {
+        $sources = {
+          'puppetlabs' => {
+            'ensure'   => present,
+            'location' => 'http://apt.puppetlabs.com',
+            'repos'    => 'main',
+            'key'      => {
+              'id'     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+              'server' => 'pgp.mit.edu',
+            },
+          },
+        }
+      }
       class { 'apt':
         update => {
           'frequency' => 'always',
@@ -23,19 +38,7 @@ class { 'apt':
           'preferences'    => true,
           'preferences.d'  => true,
         },
-        sources => $::lsbdiscodename ? {
-          'lucid' => undef,
-          default => { 'puppetlabs' => {
-              'ensure'   => present,
-              'location' => 'http://apt.puppetlabs.com',
-              'repos'    => 'main',
-              'key'      => {
-                'id'     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
-                'server' => 'pgp.mit.edu',
-              },
-            },
-          },
-        },
+        sources => $sources,
       }
       EOS