Fix saltmod & saltutils due to #11337 & f798c953 breakages

[kiorky]

/cc @thatch45 @techdragon @s0undt3ch

cf f798c95
cf #11337

[ghost]

Test FAILed.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/2758/

[s0undt3ch]

Can you provide me a failing case so I can add as a test case?

[kiorky]

test

test.sls
salt.state:
  salt.state:
    - tgt: [devhost10.local]
    - sls: test2
    - expr_form: list
    - concurrent: true

test2.sls
/bin/true:
  cmd.run: []

With my patch:

local:
----------
          ID: salt.state
    Function: salt.state
      Result: True
     Comment: States ran successfully. Updating devhost10.local.
     Changes:
              devhost10.local:
              ----------
                        ID: /bin/true
                  Function: cmd.run
                    Result: True
                   Comment: Command "/bin/true" run
                   Changes:
                            ----------
                            pid:
                                9536
                            retcode:
                                0
                            stderr:

                            stdout:


              Summary
              ------------
              Succeeded: 1 (changed=1)
              Failed:    0
              ------------
              Total states run:     1

Summary
------------
Succeeded: 1 (changed=1)
Failed:    0
------------
Total states run:     1

without my patch

local:
----------
          ID: salt.state
    Function: salt.state
      Result: False
     Comment: Run failed on minions: devhost10.local
              Failures:
                  devhost10.local:
                  ----------
                            ID: /bin/true
                      Function: cmd.run
                        Result: True
                       Comment: Command "/bin/true" run
                       Changes:
                                ----------
                                pid:
                                    9369
                                retcode:
                                    0
                                stderr:

                                stdout:


                  Summary
                  ------------
                  Succeeded: 1 (changed=1)
                  Failed:    0
                  ------------
                  Total states run:     1
     Changes:

Summary
------------
Succeeded: 0
Failed:    1
------------
Total states run:     1 <- FAILING

[kiorky]

rebased the pr

[ghost]

Test FAILed.
Refer to this link for build results: http://jenkins.saltstack.com/job/salt-pr-build/2762/

[kiorky]

The opposite

testb.sls
salt.state:
  salt.state:
    - tgt: [devhost10.local]
    - sls: test2b
    - expr_form: list
    - concurrent: true

test2b.sls
/bin/false:
  cmd.run: []

should also be test as a falling state

[thatch45]

Thanks for the catch, we did make the state shecks better so this old workaround should no longer be needed