Merge pull request #29264 from alprs/fix-ssh_auth_absent_test

Prevent ssh_auth.absent from running when test=True
saltstack · Nov 30, 2015 · 8d32d8d · 8d32d8d
2 parents 459d30f + 9193676
commit 8d32d8d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/salt/states/ssh_auth.py b/salt/states/ssh_auth.py
@@ -394,6 +394,18 @@ def absent(name,
            'result': True,
            'comment': ''}
 
+    if __opts__['test']:
+        ret['result'], ret['comment'] = _absent_test(
+                user,
+                name,
+                enc,
+                comment,
+                options or [],
+                source,
+                config,
+                )
+        return ret
+
     # Extract Key from file if source is present
     if source != '':
         key = __salt__['cp.get_file_str'](
@@ -438,18 +450,6 @@ def absent(name,
                 comment = comps[2]
         ret['comment'] = __salt__['ssh.rm_auth_key'](user, name, config)
 
-    if __opts__['test']:
-        ret['result'], ret['comment'] = _absent_test(
-                user,
-                name,
-                enc,
-                comment,
-                options or [],
-                source,
-                config,
-                )
-        return ret
-
     if ret['comment'] == 'User authorized keys file not present':
         ret['result'] = False
         return ret

diff --git a/tests/unit/states/ssh_auth_test.py b/tests/unit/states/ssh_auth_test.py
@@ -83,8 +83,6 @@ def test_absent(self):
                'comment': ''}
 
         mock = MagicMock(side_effect=['User authorized keys file not present',
-                                      'User authorized keys file not present',
-                                      'User authorized keys file not present',
                                       'Key removed'])
         mock_up = MagicMock(side_effect=['update', 'updated'])
         with patch.dict(ssh_auth.__salt__, {'ssh.rm_auth_key': mock,