Skip all salt user tests on mac

pkg/debian/rules

@@ -50,10 +50,8 @@ override_dh_install:
 	mkdir -p debian/salt-common/opt/saltstack
 	cp -R build/onedir/salt debian/salt-common/opt/saltstack/
 
-        # Generate master and minion configs
+        # Generate master config
 	mkdir -p debian/salt-master/etc/salt
 	sed 's/#user: root/user: salt/g' conf/master > debian/salt-master/etc/salt/master
-	mkdir -p debian/salt-minion/etc/salt
-	sed 's/#user: root/#user: root\ngroup: salt/g' conf/minion > debian/salt-minion/etc/salt/minion
 
 	dh_install

pkg/debian/salt-common.preinst

@@ -17,10 +17,9 @@ case "$1" in
     # 3. create user if not existing
     if ! getent passwd | grep -q "^$SALT_USER:"; then
       echo -n "Adding system user $SALT_USER.."
-      useradd --quiet \
-              --system \
+      useradd --system \
               --no-create-home \
-              -s /sbin/nologin
+              -s /sbin/nologin \
               -g $SALT_GROUP \
               $SALT_USER 2>/dev/null || true
       echo "..done"

pkg/debian/salt-minion.install

@@ -1,3 +1,4 @@
+conf/minion /etc/salt
 conf/proxy /etc/salt
 pkg/common/salt-minion.service /lib/systemd/system
 pkg/common/salt-proxy@.service /lib/systemd/system

pkg/rpm/salt.spec

@@ -151,9 +151,8 @@ cd $RPM_BUILD_DIR
   $RPM_BUILD_DIR/build/venv/bin/tools pkg build salt-onedir . --package-name $RPM_BUILD_DIR/build/salt --platform linux
   $RPM_BUILD_DIR/build/venv/bin/tools pkg pre-archive-cleanup --pkg $RPM_BUILD_DIR/build/salt
 
-  # Generate master and minion configs
+  # Generate master config
   sed 's/#user: root/user: salt/g' %{_salt_src}/conf/master > $RPM_BUILD_DIR/build/master
-  sed 's/#group: root/#user: root\ngroup: salt/g' %{_salt_src}/conf/minion > $RPM_BUILD_DIR/build/minion
 
 %else
   # The relenv onedir is being provided, all setup up until Salt is installed
@@ -164,9 +163,8 @@ cd $RPM_BUILD_DIR
   # Fix any hardcoded paths to the relenv python binary on any of the scripts installed in the <onedir>/bin directory
   find salt/bin/ -type f -exec sed -i 's:#!/\(.*\)salt/bin/python3:#!/bin/sh\n"exec" "$$(dirname $$(readlink -f $$0))/python3" "$$0" "$$@":g' {} \;
 
-  # Generate master and minion configs
+  # Generate master config
   sed 's/#user: root/user: salt/g' %{_salt_src}/conf/master > $RPM_BUILD_DIR/build/master
-  sed 's/#group: root/#user: root\ngroup: salt/g' %{_salt_src}/conf/minion > $RPM_BUILD_DIR/build/minion
 
   cd $RPM_BUILD_DIR
 %endif
@@ -224,7 +222,7 @@ install -m 0755 %{buildroot}/opt/saltstack/salt/spm %{buildroot}%{_bindir}/spm
 install -m 0755 %{buildroot}/opt/saltstack/salt/salt-pip %{buildroot}%{_bindir}/salt-pip
 
 # Add the config files
-install -p -m 0640 $RPM_BUILD_DIR/build/minion %{buildroot}%{_sysconfdir}/salt/minion
+install -p -m 0640 %{_salt_src}/conf/minion %{buildroot}%{_sysconfdir}/salt/minion
 install -p -m 0640 $RPM_BUILD_DIR/build/master %{buildroot}%{_sysconfdir}/salt/master
 install -p -m 0640 %{_salt_src}/conf/cloud %{buildroot}%{_sysconfdir}/salt/cloud
 install -p -m 0640 %{_salt_src}/conf/roster %{buildroot}%{_sysconfdir}/salt/roster

pkg/tests/integration/test_salt_user.py

@@ -7,6 +7,7 @@ from pytestskipmarkers.utils import platform
 
 pytestmark = [
     pytest.mark.skip_on_windows,
+    pytest.mark.skip_on_darwin,
 ]
 
 
@@ -14,8 +15,6 @@ def test_salt_user_master(salt_master, install_salt):
     """
     Test the correct user is running the Salt Master
     """
-    if platform.is_windows() or platform.is_darwin():
-        pytest.skip("Package does not have user set. Not testing user")
     match = False
     for proc in psutil.Process(salt_master.pid).children():
         assert proc.username() == "salt"