fix up symlinks

.kitchen.yml

@@ -13,7 +13,7 @@ driver:
   use_sudo: false
   hostname: salt
   privileged: true
-  username: root
+  username: kitchen
   volume:
     - /var/run/docker.sock:/docker.sock
   cap_add:
@@ -21,11 +21,8 @@ driver:
   disable_upstart: false
   provision_command:
     - echo 'L /run/docker.sock - - - - /docker.sock' > /etc/tmpfiles.d/docker.conf
-transport:
-  name: sftp
 <% end %>
 
-sudo: true
 provisioner:
   name: salt_solo
   salt_install: bootstrap
@@ -33,6 +30,7 @@ provisioner:
   salt_bootstrap_url: https://bootstrap.saltstack.com
   salt_bootstrap_options: -X stable <%= version %>
   log_level: info
+  sudo: true
   require_chef: false
   remote_states:
     name: git://github.com/saltstack/salt-jenkins.git

tests/integration/runners/test_runner_returns.py

@@ -125,6 +125,10 @@ class RunnerReturnsTest(ShellCase):
         self.clean_return(deserialized['return'])
 
         # Now we have something sane we can reliably compare in an assert.
+        if 'SUDO_USER' in os.environ:
+            user = 'sudo_{0}'.format(os.environ['SUDO_USER'])
+        else:
+            user = RUNTIME_VARS.RUNNING_TESTS_USER
         self.assertEqual(
             deserialized,
             {'return': {'fun': 'runner.test.arg',
@@ -132,5 +136,5 @@ class RunnerReturnsTest(ShellCase):
                         'jid': jid,
                         'return': {'args': ['foo'], 'kwargs': {'bar': 'hello world!'}},
                         'success': True,
-                        'user': RUNTIME_VARS.RUNNING_TESTS_USER if 'SUDO_USER' not in os.environ else 'root'}}
+                        'user': user}}
         )