From: Melissa Stone <melissa@puppet.com>
Date: Thu, 26 Apr 2018 17:31:24 +0000 (-0700)
Subject: Remove windows from metadata.json
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=beb0aa2b549ed4b6f90d82a864a443e35c102b38;p=puppet-mailalias_core.git

Remove windows from metadata.json
---

diff --git a/metadata.json b/metadata.json
index 6911a5a..782e7f6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -47,14 +47,6 @@
         "16.04"
       ]
     },
-    {
-      "operatingsystem": "windows",
-      "operatingsystemrelease": [
-        "2008 R2",
-        "2012 R2",
-        "10"
-      ]
-    },
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
diff --git a/spec/acceptance/tests/destroy_spec.rb b/spec/acceptance/tests/destroy_spec.rb
index 4a740db..0f805a5 100644
--- a/spec/acceptance/tests/destroy_spec.rb
+++ b/spec/acceptance/tests/destroy_spec.rb
@@ -4,7 +4,7 @@ RSpec.context 'should delete an email alias' do
   name = "pl#{rand(999_999).to_i}"
 
   before(:all) do
-    agents.each do |agent|
+    non_windows_agents.each do |agent|
       # (setup) backup alias file
       on(agent, 'cp /etc/aliases /tmp/aliases', acceptable_exit_codes: [0, 1])
 
@@ -19,13 +19,13 @@ RSpec.context 'should delete an email alias' do
   end
 
   after(:all) do
-    agents.each do |agent|
+    non_windows_agents.each do |agent|
       # (teardown) restore the alias file
       on(agent, 'mv /tmp/aliases /etc/aliases', acceptable_exit_codes: [0, 1])
     end
   end
 
-  agents.each do |agent|
+  non_windows_agents.each do |agent|
     it 'deletes the aliases database with puppet' do
       args = ['ensure=absent',
               'recipient="foo,bar,baz"']
diff --git a/spec/acceptance/tests/query_spec.rb b/spec/acceptance/tests/query_spec.rb
index 1a7ab42..17e0bbf 100644
--- a/spec/acceptance/tests/query_spec.rb
+++ b/spec/acceptance/tests/query_spec.rb
@@ -25,7 +25,7 @@ RSpec.context 'should be able to find an exisitng email alias' do
     end
   end
 
-  agents.each do |agent|
+  non_windows_agents.each do |agent|
     it 'queries for the mail alias with puppet' do
       on(agent, puppet_resource('mailalias', name)) do
         fail_test "didn't find the scheduled_task #{name}" unless stdout.include? 'present'