fix(archlinux): fix test setup

saltstack-formulas · Jan 16, 2020 · 281846e · 281846e
1 parent 4176716
commit 281846e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/test/integration/default/controls/pkgs_spec.rb b/test/integration/default/controls/pkgs_spec.rb
@@ -38,11 +38,6 @@
   platform_packages = %w[]
   held_packages = {}
   lock_file = ''
-# Adding empty Arch entries, to get tests passing
-when 'arch'
-  platform_packages = %w[]
-  held_packages = {}
-  lock_file = ''
 when 'debian'
   platform_packages = %w[]
   held_packages = {
@@ -51,6 +46,13 @@
     'iotop': '0.6-'
   }
   lock_file = '/var/lib/dpkg/status'
+when 'linux'
+  case platform[:name]
+  when 'arch'
+    platform_packages = %w[ruby]
+    held_packages = {}
+    lock_file = ''
+  end
 end
 
 # FIXME: - not testing Held packages

diff --git a/test/integration/default/controls/remote_pkgs_spec.rb b/test/integration/default/controls/remote_pkgs_spec.rb
@@ -4,7 +4,8 @@
 remote_pkgs = ['zoom']
 
 case platform[:family]
-when 'suse'
+# `linux` here is sufficient for `arch`
+when 'suse', 'linux'
   remote_pkgs = []
 end
 

diff --git a/test/salt/pillar/arch.sls b/test/salt/pillar/arch.sls
@@ -4,9 +4,10 @@
 packages:
   pkgs:
     held:
-      - alien
+      # - alien
       - iotop
     wanted:
+      - ruby
       - git
       - less
       - bc
@@ -17,7 +18,6 @@ packages:
     required:
       pkgs:
         - git
-        - yum-plugin-versionlock
   pips:
     wanted:
       - attrs
@@ -33,5 +33,5 @@ packages:
       - diff-lcs
       - kitchen-vagrant
       - kwalify
-  remote_pkgs:
-    zoom: 'https://zoom.us/client/latest/zoom_x86_64.rpm'
+#   remote_pkgs:
+#     zoom: 'https://zoom.us/client/latest/zoom_x86_64.tar.xz'