Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/fix-trunk into lp:snappy-ecosystem-tests

Proposed by Omer Akram
Status: Merged
Approved by: Omer Akram
Approved revision: no longer in the source branch.
Merged at revision: 31
Proposed branch: lp:~canonical-platform-qa/snappy-ecosystem-tests/fix-trunk
Merge into: lp:snappy-ecosystem-tests
Diff against target: 22 lines (+5/-7)
1 file modified
snappy_ecosystem_tests/environment/ (+5/-7)
To merge this branch: bzr merge lp:~canonical-platform-qa/snappy-ecosystem-tests/fix-trunk
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Approve
Santiago Baldassin (community) Approve
Review via email:

Commit message

fix ssh setup

Description of the change

fix ssh setup

To post a comment you must log in.
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Santiago Baldassin (sbaldassin) wrote :

Code looks good to me

review: Approve
Revision history for this message
platform-qa-bot (platform-qa-bot) :
review: Approve (continuous-integration)
31. By Omer Akram

fix ssh setup.

Approved by platform-qa-bot, Santiago Baldassin.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snappy_ecosystem_tests/environment/'
2--- snappy_ecosystem_tests/environment/ 2017-03-03 15:52:55 +0000
3+++ snappy_ecosystem_tests/environment/ 2017-03-03 18:11:20 +0000
4@@ -112,13 +112,11 @@
5 os.path.expanduser('~') + '/.ssh/').read().strip('\n')
6 container.files.put('/home/ubuntu/.ssh/authorized_keys', pub_key)
7 # Allow export of environment variables over ssh.
8- container.execute(
10- ' '.join(PROFILES[profile][container_type]
11- ['environment_variables'].keys())
12- )
13- )
14- container.execute('service ssh restart')
15+ container.execute(shlex.split(COMMAND_ALLOW_ENV_VARS.format(
16+ ' '.join(PROFILES[profile][container_type]
17+ ['environment_variables'].keys()))
18+ ))
19+ container.execute(shlex.split('service ssh restart'))
21 def setup(self, profile):
22 """setup the container based on the profile"""


People subscribed via source and target branches