Create fake home dir per test user, refs #214.

Author: mboersma

client/deis.py

@@ -1757,8 +1757,11 @@ def providers_discover(self, args):  # noqa
             running_vms = ""
         # Vagrant internally names a running VM using the folder name in which the Vagrantfile
         # resides, eg; my-deis-code-folder_default_1383326629
-        deis_codebase_folder = self._session.git_root().split('/')[-1]
-        if deis_codebase_folder in running_vms:
+        try:
+            deis_codebase_folder = self._session.git_root().split('/')[-1]
+        except EnvironmentError:
+            deis_codebase_folder = None
+        if deis_codebase_folder and deis_codebase_folder in running_vms:
             print("Discovered locally running Deis Controller VM")
             # In order for the Controller to be able to boot Vagrant VMs it needs to run commands
             # on the host machine. It does this via an SSH server. In order to access that server

client/tests/utils.py

@@ -8,7 +8,9 @@
 import random
 import re
 import shutil
+import stat
 import tempfile
+from urllib2 import urlparse
 from uuid import uuid4
 
 import pexpect
@@ -23,7 +25,8 @@
     print 'Error: env var DEIS_SERVER must point to a Deis controller URL.'
 DEIS_TEST_FLAVOR = os.environ.get('DEIS_TEST_FLAVOR', 'ec2-us-west-2')
 REPOSITORIES = {
-    # 'Clojure': 'https://github.com/opdemand/example-clojure-ring.git',
+    # 'example-clojure-ring': ('Clojure', 'https://github.com/opdemand/example-clojure-ring.git'),
+    'Clojure': 'https://github.com/opdemand/example-clojure-ring.git',
     # 'Python': 'https://github.com/opdemand/example-python-django.git',
     'Python': 'https://github.com/opdemand/example-python-flask.git',
     'Java': 'https://github.com/opdemand/example-java-jetty.git',
@@ -55,11 +58,40 @@ def register():
     """Register a new Deis user from the command line."""
     username = "autotester-{}".format(uuid4().hex[:4])
     password = 'password'
-    ssh_path = os.path.expanduser('~/.ssh')
-    child = pexpect.spawn("ssh-keygen -f /{}/{} -t rsa -N '' -C {}".format(
-        ssh_path, username, username))
+    home = os.path.join('/tmp', username)
+    os.environ['HOME'] = home
+    os.mkdir(home)
+    os.chdir(home)
+    # generate an SSH key
+    ssh_path = os.path.expandvars('$HOME/.ssh')
+    os.mkdir(ssh_path, 0700)
+    key_path = "/{}/{}".format(ssh_path, username)
+    child = pexpect.spawn("ssh-keygen -f {} -t rsa -N '' -C {}".format(
+        key_path, username))
     child.expect("Your public key has been saved")
     child.expect(pexpect.EOF)
+    # write out ~/.ssh/config
+    ssh_config_path = os.path.expandvars("$HOME/.ssh/config")
+    with open(ssh_config_path, 'w') as ssh_config:
+        # get hostname from DEIS_SERVER
+        server = urlparse.urlparse(DEIS_SERVER).netloc
+        ssh_config.write("""\
+    Hostname {}
+    IdentitiesOnly yes
+    IdentityFile {}/.ssh/{}
+""".format(server, home, username))
+    # make a GIT_SSH script to enforce use of our key
+    git_ssh_path = os.path.expandvars("$HOME/git_ssh.sh")
+    with open(git_ssh_path, 'w') as git_ssh:
+        git_ssh.write("""\
+#!/bin/sh
+
+SSH_ORIGINAL_COMMAND="ssh $@"
+ssh -F {} "$@"
+""".format(ssh_config_path))
+    os.chmod(git_ssh_path, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH
+             | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
+    os.environ['GIT_SSH'] = git_ssh_path
     child = pexpect.spawn("{} register {}".format(DEIS, DEIS_SERVER))
     child.expect('username: ')
     child.sendline(username)
@@ -71,9 +103,7 @@ def register():
     child.sendline('autotest@opdemand.com')
     child.expect('Which would you like to use with Deis')
     for index, key in re.findall('(\d)\) ([ \S]+)', child.before):
-        # TODO: can't use our generated key--gitosis error!
-        # if username in key:
-        if 'id_rsa' in key:
+        if username in key:
             child.sendline(index)
             break
     opt = child.expect(['Import EC2 credentials\? \(y/n\) :',