Added ssh-key generation per test user.

Author: mboersma

client/deis.py

@@ -196,11 +196,11 @@ def _newname(template="Thread-{}"):
 
 
 FRAMES = {
-    'arrow':  ['^', '>', 'v', '<'],
+    'arrow': ['^', '>', 'v', '<'],
     'dots': ['...', 'o..', '.o.', '..o'],
     'ligatures': ['bq', 'dp', 'qb', 'pd'],
     'lines': [' ', '-', '=', '#', '=', '-'],
-    'slash':  ['-', '\\', '|', '/'],
+    'slash': ['-', '\\', '|', '/'],
 }
 
 
@@ -1730,13 +1730,13 @@ def providers_discover(self, args):  # noqa
         for provider, name, field in provider_data:
             creds = get_provider_creds(provider)
             if creds:
-                print ("Found {} credentials: {}".format(name, creds[field]))
-                inp = raw_input('Import these credentials? (y/n) : ')
+                print ("Discovered {} credentials: {}".format(name, creds[field]))
+                inp = raw_input("Import {} credentials? (y/n) : ".format(name))
                 if inp.lower().strip('\n') != 'y':
                     print('Aborting.')
                 else:
                     body = {'creds': json.dumps(creds)}
-                    sys.stdout.write("Uploading {} credentials... ".format(provider))
+                    sys.stdout.write("Uploading {} credentials... ".format(name))
                     sys.stdout.flush()
                     endpoint = "/api/providers/{}".format(provider)
                     response = self._dispatch('patch', endpoint, json.dumps(body))
@@ -1745,7 +1745,7 @@ def providers_discover(self, args):  # noqa
                     else:
                         raise ResponseError(response)
             else:
-                print("No {} credentials discovered.".format(provider))
+                print("No {} credentials discovered.".format(name))
 
         # Check for locally booted Deis Controller VM
         try:
@@ -1759,7 +1759,7 @@ def providers_discover(self, args):  # noqa
         # resides, eg; my-deis-code-folder_default_1383326629
         deis_codebase_folder = self._session.git_root().split('/')[-1]
         if deis_codebase_folder in running_vms:
-            print("Detected locally running Deis Controller VM")
+            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
             # we need to send the current user's name and host.
@@ -1792,7 +1792,7 @@ def providers_discover(self, args):  # noqa
             else:
                 raise ResponseError(response)
         else:
-            print("No Vagrant VMs detected")
+            print("No Vagrant VMs discovered.")
 
     def providers_info(self, args):
         """

client/tests/test_apps.py

@@ -40,7 +40,7 @@ def tearDownClass(cls):
         # delete the formation
         child = pexpect.spawn("{} formations:destroy {} --confirm={}".format(
             DEIS, cls.formation, cls.formation))
-        child.expect('done in ', timeout=5*60)
+        child.expect('done in ', timeout=5 * 60)
         child.expect(pexpect.EOF)
         teardown(cls.username, cls.password, cls.repo_dir)
 
@@ -49,7 +49,7 @@ def test_create(self):
         self.assertIsNotNone(self.formation)
         child = pexpect.spawn("{} create --formation={}".format(
             DEIS, self.formation))
-        child.expect('done, created (?P<name>[-_\w]+)')
+        child.expect('done, created (?P<name>[-_\w]+)', timeout=5 * 60)
         app = child.match.group('name')
         child.expect('Git remote deis added')
         child.expect(pexpect.EOF)
@@ -60,7 +60,8 @@ def test_create(self):
         apps = re.findall(r'([-_\w]+) {\w?}', child.before)
         self.assertIn(app, apps)
         # destroy the app
-        child = pexpect.spawn("{} apps:destroy --confirm={}".format(DEIS, app))
+        child = pexpect.spawn("{} apps:destroy --confirm={}".format(DEIS, app),
+                              timeout=5 * 60)
         child.expect('Git remote deis removed')
         child.expect(pexpect.EOF)
 
@@ -69,7 +70,7 @@ def test_destroy(self):
         self.assertIsNotNone(self.formation)
         child = pexpect.spawn("{} apps:create --formation={}".format(
             DEIS, self.formation))
-        child.expect('done, created ([-_\w]+)')
+        child.expect('done, created ([-_\w]+)', timeout=5 * 60)
         app = child.match.group(1)
         child.expect(pexpect.EOF)
         # check that it's in the list of apps
@@ -108,7 +109,7 @@ def test_list(self):
         # delete the app
         child = pexpect.spawn("{} apps:destroy --app={} --confirm={}".format(
             DEIS, app, app))
-        child.expect('done in ', timeout=5*60)
+        child.expect('done in ', timeout=5 * 60)
         child.expect(pexpect.EOF)
         # list apps and get their names
         child = pexpect.spawn("{} apps:list".format(DEIS))
@@ -142,7 +143,7 @@ def test_info(self):
         # delete the app
         child = pexpect.spawn("{} apps:destroy --app={} --confirm={}".format(
             DEIS, app, app))
-        child.expect('done in ', timeout=5*60)
+        child.expect('done in ', timeout=5 * 60)
         child.expect(pexpect.EOF)
 
     # def test_calculate(self):

client/tests/utils.py

@@ -6,6 +6,7 @@
 import os
 import os.path
 import random
+import re
 import shutil
 import tempfile
 from uuid import uuid4
@@ -22,14 +23,14 @@
     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',
+    # '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',
     'Go': 'https://github.com/opdemand/example-go.git',
     'Node.js': 'https://github.com/opdemand/example-nodejs-express.git',
     # 'Ruby/Rails': 'https://github.com/opdemand/example-rails-helloworld.git',
-    'Ruby/Rails': 'https://github.com/opdemand/example-rails-todo.git',
+    # 'Ruby/Rails': 'https://github.com/opdemand/example-rails-todo.git',
     'Ruby/Rack': 'https://github.com/opdemand/example-ruby-sinatra.git',
 }
 
@@ -44,12 +45,21 @@ def purge(username, password):
     child.expect('\? \(y/n\) ')
     child.sendline('y')
     child.expect(pexpect.EOF)
+    ssh_path = os.path.expanduser('~/.ssh')
+    child = pexpect.spawn(os.path.expanduser(
+        "rm -f {}/{}*".format(ssh_path, username)))
+    child.expect(pexpect.EOF)
 
 
 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))
+    child.expect("Your public key has been saved")
+    child.expect(pexpect.EOF)
     child = pexpect.spawn("{} register {}".format(DEIS, DEIS_SERVER))
     child.expect('username: ')
     child.sendline(username)
@@ -60,9 +70,24 @@ def register():
     child.expect('email: ')
     child.sendline('autotest@opdemand.com')
     child.expect('Which would you like to use with Deis')
-    child.sendline('1')
-    child.expect('Import these credentials\? \(y/n\) :')
-    child.sendline('y')
+    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:
+            child.sendline(index)
+            break
+    opt = child.expect(['Import EC2 credentials\? \(y/n\) :',
+                       'No EC2 credentials discovered.'])
+    if opt == 0:
+        child.sendline('y')
+    opt = child.expect(['Import Rackspace credentials\? \(y/n\) :',
+                       'No Rackspace credentials discovered.'])
+    if opt == 0:
+        child.sendline('y')
+    opt = child.expect(['Import DigitalOcean credentials\? \(y/n\) :',
+                       'No DigitalOcean credentials discovered.'])
+    if opt == 0:
+        child.sendline('y')
     child.expect(pexpect.EOF)
     return username, password