Merge pull request #67 from netmanagers/fix-tests

tests(repositories): change to a repo with no key expiration

test/integration/repositories/controls/repositories_spec.rb

@@ -25,14 +25,14 @@ control 'Apt repositories' do
     its('mode') { should cmp '0755' }
   end
 
-  describe file('/etc/apt/sources.list.d/spotify-binary.list') do
+  describe file('/etc/apt/sources.list.d/multimedia-stable-binary.list') do
     it { should exist }
     it { should be_owned_by 'root' }
     it { should be_grouped_into 'root' }
     its('mode') { should cmp '0644' }
     its(:content) do
       should match(
-        %r{deb \[arch=amd64\] http://repository.spotify.com stable non-free}
+        %r{deb \[arch=amd64\] http://www.deb-multimedia.org stable main}
       )
     end
   end

test/salt/pillar/repositories.pillar.sls

@@ -6,12 +6,12 @@ apt:
   clean_sources_list_d: true
 
   repositories:
-    spotify:
+    multimedia-stable:
       distro: stable
-      url: http://repository.spotify.com
+      url: http://www.deb-multimedia.org
       arch: [amd64]
-      comps: [non-free]
-      keyid: 2EBF997C15BDA244B6EBF5D84773BD5E130D1D45
+      comps: [main]
+      keyid: 5C808C2B65558117
       keyserver: keyserver.ubuntu.com
     heroku:
       distro: ./