Merge branch 'env_dict_to_commands' into dev

Author: rkdarst

batchspawner/batchspawner.py

@@ -261,7 +261,7 @@ def read_job_state(self):
                         format_template(self.batch_query_cmd, **subvars)))
         self.log.debug('Spawner querying job: ' + cmd)
         try:
-            out = yield self.run_command(cmd)
+            out = yield self.run_command(cmd, env=self.get_env())
             self.job_status = out
         except Exception as e:
             self.log.error('Error querying job ' + self.job_id)
@@ -280,7 +280,7 @@ def cancel_batch_job(self):
         cmd = ' '.join((format_template(self.exec_prefix, **subvars),
                         format_template(self.batch_cancel_cmd, **subvars)))
         self.log.info('Cancelling job ' + self.job_id + ': ' + cmd)
-        yield self.run_command(cmd)
+        yield self.run_command(cmd, env=self.get_env())
 
     def load_state(self, state):
         """load job_id from state"""
@@ -512,7 +512,12 @@ def user_env(self, env):
         return env
 
     def get_env(self):
-        """Add user environment variables"""
+        """Add user environment variables.
+
+        Everything here should be passed to the user's job.  If it is
+        used to authenticate to the batch system commands as an admin,
+        beware that the user will get them too.
+        """
         env = super().get_env()
         env = self.user_env(env)
         return env