fix tests

doodad/credentials/ssh.py

@@ -35,11 +35,9 @@ def get_ssh_bash_cmd(self, cmd):
         prefix = self.get_ssh_cmd_prefix()
         return prefix + " '%s'"%cmd
 
-    def get_ssh_script_cmd(self, script_name):
-        cmd = 'ssh %s@%s' % (self.username, self.hostname)
-        if self.identity_file:
-            cmd += ' -i %s' % self.identity_file
-        cmd += " 'bash -s' < %s" % script_name
+    def get_ssh_script_cmd(self, script_name, shell_interpreter='bash'):
+        cmd = self.get_ssh_cmd_prefix()
+        cmd += "'%s -s' < %s" % (shell_interpreter, script_name)
         return cmd
 
     def get_scp_cmd(self, source, destination, src_remote=True, recursive=True):

doodad/credentials/test_ssh.py

@@ -0,0 +1,13 @@
+import unittest
+
+from doodad.credentials import ssh
+
+class TestSSHCreds(unittest.TestCase):
+    def test_user_host(self):
+        creds = ssh.get_credentials(username='a', hostname='b.com')
+        self.assertEqual(creds.user_host, '[email protected]')
+
+    def test_global_set(self):
+        ssh.set_identity_file('mykey')
+        creds = ssh.get_credentials(username='a', hostname='b.com')
+        self.assertEqual(creds.identity_file, 'mykey')

doodad/darchive/test_archive_builder.py

@@ -71,7 +71,7 @@ def test_gcp(self):
         """
         mnts = []
         mnts.append(mount.MountGCP(
-            local_dir='test_dir',
+            gcp_path='test_dir',
             dry=True,
         ))
         payload_script = 'echo hello123'

doodad/launch/mode.py

@@ -59,7 +59,8 @@ def __init__(self, ssh_credentials, **kwargs):
         self.ssh_cred = ssh_credentials
 
     def _get_run_command(self, script_filename):
-        return self.ssh_cred.get_ssh_script_cmd(script_filename)
+        return self.ssh_cred.get_ssh_script_cmd(script_filename, 
+                                                shell_interpreter=self.shell_interpreter)
 
 
 class GCPMode(LaunchMode):

doodad/launch/test_mode.py

@@ -23,5 +23,5 @@ def test_mode(self):
         launcher = mode.SSHMode(credentials, shell_interpreter='bashy')
         self.assertEqual(
             launcher._get_run_command('myscript.sh'),
-            'ssh [email protected] -s \'bashy -s \' < myscript.sh'
+            'ssh [email protected] \'bashy -s\' < myscript.sh'
         )

scripts/gcp/gcp_shutdown_script.sh

@@ -8,7 +8,7 @@ bucket_name=$(query_metadata bucket_name)
 gcp_bucket_path=$(query_metadata gcp_bucket_path)
 instance_name=$(curl http://metadata/computeMetadata/v1/instance/name -H "Metadata-Flavor: Google")
 
-gsutil cp -r /doodad gs://$bucket_name/$gcp_bucket_path/logs
+gsutil cp -r /doodad/* gs://$bucket_name/$gcp_bucket_path/logs
 # sync stdout
 gcp_bucket_path=${gcp_bucket_path%/}  # remove trailing slash if present
 gsutil cp /home/ubuntu/user_data.log gs://$bucket_name/$gcp_bucket_path/${instance_name}_stdout.log