1
=== modified file 'snappy_ecosystem_tests/environment/setup.py'
2
--- snappy_ecosystem_tests/environment/setup.py	2017-03-01 14:52:43 +0000
3
+++ snappy_ecosystem_tests/environment/setup.py	2017-03-07 17:41:57 +0000
4
@@ -28,6 +28,7 @@
5
28
28
6
29
logging.basicConfig(level=logging.DEBUG)
29
logging.basicConfig(level=logging.DEBUG)
7
30
30
8
31
9
31
def main(mode, profile):
32
def main(mode, profile):
10
32
    """Main script"""
33
    """Main script"""
11
33
    manager = get_manager(mode)
34
    manager = get_manager(mode)
12
34
35
13
=== modified file 'snappy_ecosystem_tests/helpers/snapcraft/build_snap.py'
14
--- snappy_ecosystem_tests/helpers/snapcraft/build_snap.py	2017-03-02 16:24:59 +0000
15
+++ snappy_ecosystem_tests/helpers/snapcraft/build_snap.py	2017-03-07 17:41:57 +0000
16
@@ -53,13 +53,21 @@
17
53
class SnapBuilder:
53
class SnapBuilder:
18
54
    """Class to build a snap on a remote machine and download its content."""
54
    """Class to build a snap on a remote machine and download its content."""
19
55
    def __init__(self, hostname, username, port=22):
55
    def __init__(self, hostname, username, port=22):
21
56
        self.client = SSHManager.get_instance(hostname, username, port)
56
        self.hostname = hostname
22
57
        self.username = username
23
58
        self.port = port
24
59
25
60
    @property
26
61
    def ssh(self):
27
62
        """Property tu ensure we get an active connection for every command
28
63
         execution over ssh"""
29
64
        return SSHManager.get_instance(self.hostname, self.username, self.port)
30
57
65
31
58
    def is_host_setup(self):
66
    def is_host_setup(self):
32
59
        """Return bool representing whether the remote host is setup by
67
        """Return bool representing whether the remote host is setup by
33
60
        checking if snapcraft package is installed."""
68
        checking if snapcraft package is installed."""
34
61
        try:
69
        try:
36
62
            self.client.exec_command('which snapcraft')
70
            self.ssh.exec_command('which snapcraft')
37
63
            return True
71
            return True
38
64
        except ValueError:
72
        except ValueError:
39
65
            return False
73
            return False
40
@@ -68,7 +76,7 @@
41
68
        """Setup the host to build a snap, currently only installs
76
        """Setup the host to build a snap, currently only installs
42
69
        snapcraft."""
77
        snapcraft."""
43
70
        for command in COMMANDS_SETUP:
78
        for command in COMMANDS_SETUP:
45
71
            self.client.exec_command(command)
79
            self.ssh.exec_command(command)
46
72
80
47
73
    def build(self, name, version, summary, description, grade='stable',
81
    def build(self, name, version, summary, description, grade='stable',
48
74
              confinement='strict'):
82
              confinement='strict'):
49
@@ -86,9 +94,9 @@
50
86
        """
94
        """
51
87
        if not self.is_host_setup():
95
        if not self.is_host_setup():
52
88
            self.setup_host()
96
            self.setup_host()
56
89
        tempdir = self.client.exec_command('mktemp -d')
97
        tempdir = self.ssh.exec_command('mktemp -d')
57
90
        self.client.exec_command('mkdir snap', cwd=tempdir)
98
        self.ssh.exec_command('mkdir snap', cwd=tempdir)
58
91
        self.client.exec_command('echo "{}" > snap/snapcraft.yaml'.format(
99
        self.ssh.exec_command('echo "{}" > snap/snapcraft.yaml'.format(
59
92
            SNAPCRAFT_YAML.format(
100
            SNAPCRAFT_YAML.format(
60
93
                snap_name=name,
101
                snap_name=name,
61
94
                version=version,
102
                version=version,
62
@@ -98,13 +106,13 @@
63
98
                confinement=confinement
106
                confinement=confinement
64
99
            )
107
            )
65
100
        ), cwd=tempdir)
108
        ), cwd=tempdir)
67
101
        self.client.exec_command('snapcraft', cwd=tempdir)
109
        self.ssh.exec_command('snapcraft', cwd=tempdir)
68
102
        return os.path.join(
110
        return os.path.join(
69
103
            tempdir,
111
            tempdir,
70
104
            '{name}_{version}_{arch}.snap'.format(
112
            '{name}_{version}_{arch}.snap'.format(
71
105
                name=name,
113
                name=name,
72
106
                version=version,
114
                version=version,
74
107
                arch=self.client.exec_command('dpkg --print-architecture')
115
                arch=self.ssh.exec_command('dpkg --print-architecture')
75
108
            )
116
            )
76
109
        )
117
        )
77
110
118
78
@@ -136,5 +144,5 @@
79
136
        output_path_absolute = os.path.abspath(
144
        output_path_absolute = os.path.abspath(
80
137
            os.path.join(output_location, PurePath(remote_snap_path).name)
145
            os.path.join(output_location, PurePath(remote_snap_path).name)
81
138
        )
146
        )
83
139
        self.client.pull(remote_snap_path, output_path_absolute)
147
        self.ssh.pull(remote_snap_path, output_path_absolute)
84
140
        return output_path_absolute
148
        return output_path_absolute
85
141
149
86
=== modified file 'snappy_ecosystem_tests/helpers/snapcraft/client.py'
87
--- snappy_ecosystem_tests/helpers/snapcraft/client.py	2017-03-03 14:06:17 +0000
88
+++ snappy_ecosystem_tests/helpers/snapcraft/client.py	2017-03-07 17:41:57 +0000
89
@@ -25,9 +25,9 @@
90
25
import time
25
import time
91
26
26
92
27
from snappy_ecosystem_tests.models.snap import Snap
27
from snappy_ecosystem_tests.models.snap import Snap
93
28
from snappy_ecosystem_tests.utils import ssh
94
29
from snappy_ecosystem_tests.utils.commands import build_command
28
from snappy_ecosystem_tests.utils.commands import build_command
95
30
from snappy_ecosystem_tests.utils.filters import filter_list
29
from snappy_ecosystem_tests.utils.filters import filter_list
96
30
from snappy_ecosystem_tests.utils.ssh import SSHManager
97
31
from snappy_ecosystem_tests.utils.storeconfig import get_current_store
31
from snappy_ecosystem_tests.utils.storeconfig import get_current_store
98
32
32
99
33
from snappy_ecosystem_tests.commons.config import CONFIG_STACK
33
from snappy_ecosystem_tests.commons.config import CONFIG_STACK
100
@@ -72,8 +72,13 @@
101
72
        self._login = False
72
        self._login = False
102
73
        self._cleanup()
73
        self._cleanup()
103
74
74
106
75
    @staticmethod
75
    @property
107
76
    def _run_snapcraft_command_ssh(command, debug=True):
76
    def ssh(self):
108
77
        """Property tu ensure we get an active connection for every command
109
78
         execution over ssh"""
110
79
        return SSHManager.get_instance(HOSTNAME, USERNAME, PORT)
111
80
112
81
    def _run_snapcraft_command_ssh(self, command, debug=True):
113
77
        """
82
        """
114
78
        Run snapcraft command via ssh
83
        Run snapcraft command via ssh
115
79
        :param command: the command to be executed.
84
        :param command: the command to be executed.
116
@@ -85,25 +90,21 @@
117
85
            command = build_snapcraft_command(command)
90
            command = build_snapcraft_command(command)
118
86
        if debug:
91
        if debug:
119
87
            command += ' -d'
92
            command += ' -d'
122
88
        return ssh.run_command(command, hostname=HOSTNAME, username=USERNAME,
93
        return self.ssh.exec_command(command)
121
89
                               port=PORT)
123
90
94
126
91
    @staticmethod
95
    def assert_logged_in(self):
125
92
    def assert_logged_in():
127
93
        """Assert that an user is logged.
96
        """Assert that an user is logged.
128
94
        :raise ValueError: in case login is false
97
        :raise ValueError: in case login is false
129
95
        """
98
        """
131
96
        if Snapcraft.is_logged_in() is False:
99
        if self.is_logged_in() is False:
132
97
            raise ValueError("User is not logged in, "
100
            raise ValueError("User is not logged in, "
133
98
                             "please login before using this command")
101
                             "please login before using this command")
134
99
102
137
100
    @staticmethod
103
    def is_logged_in(self):
136
101
    def is_logged_in():
138
102
        """Return bool representing if the user is logged into snapcraft."""
104
        """Return bool representing if the user is logged into snapcraft."""
139
103
        try:
105
        try:
143
104
            output = ssh.run_command(
106
            output = self.ssh.exec_command(
144
105
                'cat %s' % SNAPCRAFT_CONFIG_FILE_PATH,
107
                'cat %s' % SNAPCRAFT_CONFIG_FILE_PATH)
142
106
                hostname=HOSTNAME, username=USERNAME, port=PORT)
145
107
            return output is not ''
108
            return output is not ''
146
108
        except ValueError:
109
        except ValueError:
147
109
            return False
110
            return False
148
@@ -112,26 +113,23 @@
149
112
        """Perform cleanup actions"""
113
        """Perform cleanup actions"""
150
113
        self.logout()
114
        self.logout()
151
114
115
154
115
    @staticmethod
116
    def logout(self):
153
116
    def logout():
155
117
        """logout of snapcraft store session
117
        """logout of snapcraft store session
156
118
        :return: True if logout was successful, False otherwise
118
        :return: True if logout was successful, False otherwise
157
119
        """
119
        """
160
120
        Snapcraft._run_snapcraft_command_ssh(COMMAND_LOGOUT)
120
        self._run_snapcraft_command_ssh(COMMAND_LOGOUT)
161
121
        return not Snapcraft.is_logged_in()
121
        return not self.is_logged_in()
162
122
122
165
123
    @staticmethod
123
    def login(self, email=LOGIN_EMAIL, password=LOGIN_PASSWORD):
164
124
    def login(email=LOGIN_EMAIL, password=LOGIN_PASSWORD):
166
125
        """Login to Snapcraft. If email and/or password are not provided,
124
        """Login to Snapcraft. If email and/or password are not provided,
167
126
        use the default ones.
125
        use the default ones.
168
127
        :param email: the SSO email
126
        :param email: the SSO email
169
128
        :param password: the email password
127
        :param password: the email password
170
129
        """
128
        """
172
130
        ssh.run_command(
129
        self.ssh.exec_command((
173
131
            COMMANDS_LOGIN.format(email=email, password=password,
130
            COMMANDS_LOGIN.format(email=email, password=password,
177
132
                                  snapcraft=PATH_SNAPCRAFT),
131
                                  snapcraft=PATH_SNAPCRAFT)))
178
133
            hostname=HOSTNAME, username=USERNAME, port=PORT)
132
        return self.is_logged_in()
176
134
        return Snapcraft.is_logged_in()
179
135
133
180
136
    def list_registered(self, debug=True, raw=False):
134
    def list_registered(self, debug=True, raw=False):
181
137
        """Call snapcraft list-registered command,
135
        """Call snapcraft list-registered command,
182
@@ -180,7 +178,7 @@
183
180
        if private:
178
        if private:
184
181
            command += ' --private'
179
            command += ' --private'
185
182
        try:
180
        try:
187
183
            Snapcraft._run_snapcraft_command_ssh(command)
181
            self._run_snapcraft_command_ssh(command)
188
184
        except subprocess.CalledProcessError as _e:
182
        except subprocess.CalledProcessError as _e:
189
185
            LOGGER.error('Unable to register snap: %s', _e.output)
183
            LOGGER.error('Unable to register snap: %s', _e.output)
190
186
            return False
184
            return False
191
187
185
192
=== modified file 'snappy_ecosystem_tests/helpers/snapd/snapd.py'
193
--- snappy_ecosystem_tests/helpers/snapd/snapd.py	2017-03-02 18:36:24 +0000
194
+++ snappy_ecosystem_tests/helpers/snapd/snapd.py	2017-03-07 17:41:57 +0000
195
@@ -25,7 +25,7 @@
196
25
25
197
26
import yaml
26
import yaml
198
27
27
200
28
from snappy_ecosystem_tests.utils import ssh
28
from snappy_ecosystem_tests.utils.ssh import SSHManager
201
29
from snappy_ecosystem_tests.utils.user import get_snapd_remote_host_credentials
29
from snappy_ecosystem_tests.utils.user import get_snapd_remote_host_credentials
202
30
30
203
31
PATH_SNAP = '/usr/bin/snap'
31
PATH_SNAP = '/usr/bin/snap'
204
@@ -51,107 +51,116 @@
205
51
HOSTNAME, USERNAME, PORT = get_snapd_remote_host_credentials()
51
HOSTNAME, USERNAME, PORT = get_snapd_remote_host_credentials()
206
52
52
207
53
53
236
54
def run_snapd_command_ssh(parameters, cwd=''):
54
class Snapd:
237
55
    """Run snapd command over ssh.
55
    """Contain Snapd specific functionality to use via command
238
56
56
    line interface"""
239
57
    :param parameters: a string containing parameters for the `snap` command.
57
240
58
    :param cwd: the current working directory on the remote where the command
58
    @property
241
59
        should run.
59
    def ssh(self):
242
60
    :returns: stdout of the command
60
        """Property tu ensure we get an active connection for every command
243
61
    """
61
         execution over ssh"""
244
62
    return ssh.run_command('{} {}'.format(PATH_SNAP, parameters), cwd=cwd,
62
        return SSHManager.get_instance(HOSTNAME, USERNAME, PORT)
245
63
                           hostname=HOSTNAME, username=USERNAME, port=PORT)
63
246
64
64
    def run_snapd_command_ssh(self, command, cwd=''):
247
65
65
        """Run snapd command over ssh.
248
66
def login(email, password):
66
249
67
    """Login to snapd.
67
        :param command: a string containing parameters for the `snap` command.
250
68
68
        :param cwd: the current working directory on the remote where
251
69
    :param email: Ubuntu SSO account email address.
69
        the command should run.
252
70
    :param password: Ubuntu SSO account password.
70
        :returns: stdout of the command
253
71
    """
71
        """
254
72
    ssh.run_command(COMMANDS_LOGIN.format(email=email, password=password))
72
        if cwd:
255
73
    return is_logged_in(email)
73
            command = '{};{}'.format(cwd, command)
256
74
74
        return self.ssh.exec_command(command)
257
75
75
258
76
def is_logged_in(email):
76
    def login(self, email, password):
259
77
    """Return bool representing if the user is logged into snapd."""
77
        """Login to snapd.
260
78
    try:
78
261
79
        return json.loads(ssh.run_command('cat ~/.snap/auth.json')).get(
79
        :param email: Ubuntu SSO account email address.
262
80
            'email') == email
80
        :param password: Ubuntu SSO account password.
263
81
    except ValueError:
81
        """
264
82
        self.ssh.exec_command(COMMANDS_LOGIN.format(email=email,
265
83
                                                    password=password))
266
84
        return self.is_logged_in(email)
267
85
268
86
    def is_logged_in(self, email):
269
87
        """Return bool representing if the user is logged into snapd."""
270
88
        try:
271
89
            return json.loads(
272
90
                self.ssh.exec_command(
273
91
                    'cat ~/.snap/auth.json')).get('email') == email
274
92
        except ValueError:
275
93
            return False
276
94
277
95
    def logout(self, email):
278
96
        """Logout snapd current user."""
279
97
        if self.is_logged_in(email):
280
98
            self.ssh.exec_command(COMMAND_LOGOUT)
281
99
282
100
    def download(self, snap, channel=CHANNEL_STABLE):
283
101
        """Download the requested snap.
284
102
285
103
        :param snap: name of the snap to download.
286
104
        :param channel: name of the release channel to download from.
287
105
        """
288
106
        command = COMMAND_DOWNLOAD.format(snap=snap, channel=channel)
289
107
        self.run_snapd_command_ssh(command,
290
108
                                   cwd=self.ssh.exec_command('mktemp -d'))
291
109
292
110
    def install(self, snap, channel=CHANNEL_STABLE):
293
111
        """Install the requested snap."""
294
112
        self.ssh.exec_command(COMMAND_INSTALL.format(snap=snap,
295
113
                                                     channel=channel))
296
114
297
115
    def _is_installed(self, snap):
298
116
        """Return bool representing whether a snap is installed."""
299
117
        for installed_snap in Snapd._parse_output(
300
118
                self.run_snapd_command_ssh(COMMAND_LIST)):
301
119
            if installed_snap['name'] == snap:
302
120
                return True
303
82
        return False
121
        return False
304
83
122
379
84
123
    def remove(self, snap):
380
85
def logout(email):
124
        """Remove a snap, if its already installed."""
381
86
    """Logout snapd current user."""
125
        if self._is_installed(snap):
382
87
    if is_logged_in(email):
126
            self.run_snapd_command_ssh(COMMAND_REMOVE.format(snap=snap))
383
88
        run_snapd_command_ssh(COMMAND_LOGOUT)
127
384
89
128
    def info(self, snap, verbose=False):
385
90
129
        """Query the Ubuntu store of the information about a snap.
386
91
def download(snap, channel=CHANNEL_STABLE):
130
387
92
    """Download the requested snap.
131
        :param snap: Name of the snap for which the info is required.
388
93
132
        :param verbose: Whether to information should be detailed.
389
94
    :param snap: name of the snap to download.
133
        :return: Return a dictionary containing information about the snap.
390
95
    :param channel: name of the release channel to download from.
134
        """
391
96
    """
135
        command = COMMAND_INFO.format(snap=snap)
392
97
    command = COMMAND_DOWNLOAD.format(snap=snap, channel=channel)
136
        if verbose:
393
98
    run_snapd_command_ssh(command, cwd=ssh.run_command('mktemp -d'))
137
            command = ' '.join([command, '--verbose'])
394
99
138
        return yaml.load("""{}""".format(self.run_snapd_command_ssh(command)))
395
100
139
396
101
def install(snap, channel=CHANNEL_STABLE):
140
    def refresh(self, snap, channel=CHANNEL_STABLE):
397
102
    """Install the requested snap."""
141
        """Refresh the requested snap."""
398
103
    run_snapd_command_ssh(COMMAND_INSTALL.format(snap=snap, channel=channel))
142
        self.run_snapd_command_ssh(COMMAND_REFRESH.format(snap=snap,
399
104
143
                                                          channel=channel))
400
105
144
401
106
def _is_installed(snap):
145
    @staticmethod
402
107
    """Return bool representing whether a snap is installed."""
146
    def _parse_output(raw_output):
403
108
    for installed_snap in _parse_output(run_snapd_command_ssh(COMMAND_LIST)):
147
        """Pretty parse the output from snapd commands like `find` and `list`.
404
109
        if installed_snap['name'] == snap:
148
405
110
            return True
149
        :param raw_output: The raw output returned from the command
406
111
    return False
150
        :return: A list of dictionaries containing sorted results
407
112
151
        from the output.
408
113
152
        """
409
114
def remove(snap):
153
        split_output = raw_output.split('\n')
410
115
    """Remove a snap, if its already installed."""
154
        headers = [header.lower() for header in split_output.pop(0).split()]
411
116
    if _is_installed(snap):
155
        return [dict(zip(headers, line.split())) for line in split_output]
412
117
        run_snapd_command_ssh(COMMAND_REMOVE.format(snap=snap))
156
413
118
157
    def find(self, keyword):
414
119
158
        """Find snaps based on the provided filters
415
120
def info(snap, verbose=False):
159
416
121
    """Query the Ubuntu store of the information about a snap.
160
        :param keyword: Keyword to use for the query.
417
122
161
        :return: Return a list of dictionaries containing information about
418
123
    :param snap: Name of the snap for which the info is required.
162
            snaps matching the `keyword`.
419
124
    :param verbose: Whether to information should be detailed.
163
        """
420
125
    :return: Return a dictionary containing information about the snap.
164
        return Snapd._parse_output(
421
126
    """
165
            self.run_snapd_command_ssh(COMMAND_FIND.format(
422
127
    command = COMMAND_INFO.format(snap=snap)
166
                search_term=keyword)))
349
128
    if verbose:
350
129
        command = ' '.join([command, '--verbose'])
351
130
    return yaml.load("""{}""".format(run_snapd_command_ssh(command)))
352
131
353
132
354
133
def refresh(snap, channel=CHANNEL_STABLE):
355
134
    """Refresh the requested snap."""
356
135
    run_snapd_command_ssh(COMMAND_REFRESH.format(snap=snap, channel=channel))
357
136
358
137
359
138
def _parse_output(raw_output):
360
139
    """Pretty parse the output from snapd commands like `find` and `list`.
361
140
362
141
    :param raw_output: The raw output returned from the command
363
142
    :return: A list of dictionaries containing sorted results from the output.
364
143
    """
365
144
    split_output = raw_output.split('\n')
366
145
    headers = [header.lower() for header in split_output.pop(0).split()]
367
146
    return [dict(zip(headers, line.split())) for line in split_output]
368
147
369
148
370
149
def find(keyword):
371
150
    """Find snaps based on the provided filters
372
151
373
152
    :param keyword: Keyword to use for the query.
374
153
    :return: Return a list of dictionaries containing information about
375
154
        snaps matching the `keyword`.
376
155
    """
377
156
    return _parse_output(
378
157
        run_snapd_command_ssh(COMMAND_FIND.format(search_term=keyword)))
423
158
167
424
=== modified file 'snappy_ecosystem_tests/tests/test_snapd.py'
425
--- snappy_ecosystem_tests/tests/test_snapd.py	2017-02-22 15:47:09 +0000
426
+++ snappy_ecosystem_tests/tests/test_snapd.py	2017-03-07 17:41:57 +0000
427
@@ -22,7 +22,7 @@
428
22
22
429
23
import testtools
23
import testtools
430
24
24
432
25
from snappy_ecosystem_tests.helpers.snapd import snapd
25
from snappy_ecosystem_tests.helpers.snapd.snapd import Snapd
433
26
from snappy_ecosystem_tests.utils.storeconfig import get_store_credentials
26
from snappy_ecosystem_tests.utils.storeconfig import get_store_credentials
434
27
27
435
28
28
436
@@ -30,13 +30,14 @@
437
30
    """Tests for snapd."""
30
    """Tests for snapd."""
438
31
    def setUp(self):
31
    def setUp(self):
439
32
        super().setUp()
32
        super().setUp()
440
33
        self.snapd = Snapd()
441
33
34
442
34
    def test_info(self):
35
    def test_info(self):
443
35
        """Ensure the publisher of core snap in canonical."""
36
        """Ensure the publisher of core snap in canonical."""
445
36
        self.assertTrue('canonical', snapd.info('core')['publisher'])
37
        self.assertTrue('canonical', self.snapd.info('core')['publisher'])
446
37
38
447
38
    def test_login(self):
39
    def test_login(self):
448
39
        """Login the snapd user."""
40
        """Login the snapd user."""
449
40
        email, password = get_store_credentials()
41
        email, password = get_store_credentials()
452
41
        self.assertTrue(snapd.login(email, password))
42
        self.assertTrue(self.snapd.login(email, password))
453
42
        self.addCleanup(snapd.logout, email)
43
        self.addCleanup(self.snapd.logout, email)
454
43
44
455
=== modified file 'snappy_ecosystem_tests/utils/ssh.py'
456
--- snappy_ecosystem_tests/utils/ssh.py	2017-03-02 20:38:49 +0000
457
+++ snappy_ecosystem_tests/utils/ssh.py	2017-03-07 17:41:57 +0000
458
@@ -21,9 +21,9 @@
459
21
"""Module to connect to ssh client for running tests."""
21
"""Module to connect to ssh client for running tests."""
460
22
22
461
23
import logging
23
import logging
462
24
463
24
import paramiko
25
import paramiko
464
25
26
465
26
from snappy_ecosystem_tests.utils.user import get_snapd_remote_host_credentials
466
27
from snappy_ecosystem_tests.utils.storeconfig import get_current_store
27
from snappy_ecosystem_tests.utils.storeconfig import get_current_store
467
28
from snappy_ecosystem_tests.environment.data.snapd import STAGING_VARIABLES
28
from snappy_ecosystem_tests.environment.data.snapd import STAGING_VARIABLES
468
29
29
469
@@ -33,13 +33,17 @@
470
33
class SSHClient(paramiko.SSHClient):
33
class SSHClient(paramiko.SSHClient):
471
34
    """Extended SSHClient."""
34
    """Extended SSHClient."""
472
35
35
475
36
    def exec_command(self, command, bufsize=-1, timeout=None, get_pty=False,  # pylint: disable=arguments-differ
36
    def exec_command(self, command, bufsize=-1, timeout=None, get_pty=False,
476
37
                     environment=None, cwd=''):
37
                     environment=None):
477
38
        """Execute the given command over ssh."""
38
        """Execute the given command over ssh."""
482
39
        if cwd:
39
        if environment is None:
483
40
            command = 'cd {}; {}'.format(cwd, command)
40
            # FIXME: get environment variables dinamically
484
41
        _, stdout, stderr = super().exec_command(command, bufsize, timeout,
41
            if get_current_store() == 'staging':
485
42
                                                 get_pty, environment)
42
                environment = STAGING_VARIABLES
486
43
        _, stdout, stderr = super().exec_command(
487
44
            command, bufsize, timeout,
488
45
            get_pty,
489
46
            environment=environment)
490
43
        if stdout.channel.recv_exit_status() != 0:
47
        if stdout.channel.recv_exit_status() != 0:
491
44
            raise ValueError(stderr.read().decode().strip())
48
            raise ValueError(stderr.read().decode().strip())
492
45
        response = stdout.read().decode().strip()
49
        response = stdout.read().decode().strip()
493
@@ -102,27 +106,3 @@
494
102
            username == client.get_transport().get_username()
106
            username == client.get_transport().get_username()
495
103
        ]
107
        ]
496
104
        return connections[0] if connections else None
108
        return connections[0] if connections else None
497
105
498
106
499
107
def run_command(command, cwd=None, hostname=None, username=None, port=None):
500
108
    """Run the given command on remote machine over ssh.
501
109
502
110
    :param command: a string of the command to run.
503
111
    :param cwd: Current working directory for the command.
504
112
    :param hostname: The host to run command on.
505
113
    :param username: Name of the user on the remote host to login to.
506
114
    :param port: SSH port number.
507
115
    :raises ValueError: if command exits with non-zero status.
508
116
    :return: the stdout of the command.
509
117
    """
510
118
    # Take snapd remote credentials as default if they are not provided.
511
119
    # Just arbitrary... Could have been other ones.
512
120
    _hostname, _username, _port = get_snapd_remote_host_credentials()
513
121
    ssh = SSHManager.get_instance(
514
122
        hostname or _hostname, username or _username, port or _port)
515
123
    return ssh.exec_command(
516
124
        command,
517
125
        cwd=cwd,
518
126
        environment=STAGING_VARIABLES if get_current_store() == 'staging'
519
127
        else None
520
128
    )
Status:	Merged
Approved by:	Santiago Baldassin on 2017-03-08
Approved revision:	33
Merged at revision:	33
Proposed branch:	lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-ssh-client-driver
Merge into:	lp:snappy-ecosystem-tests
Diff against target:	520 lines (+168/-171) 6 files modified snappy_ecosystem_tests/environment/setup.py (+1/-0) snappy_ecosystem_tests/helpers/snapcraft/build_snap.py (+17/-9) snappy_ecosystem_tests/helpers/snapcraft/client.py (+22/-24) snappy_ecosystem_tests/helpers/snapd/snapd.py (+112/-103) snappy_ecosystem_tests/tests/test_snapd.py (+5/-4) snappy_ecosystem_tests/utils/ssh.py (+11/-31)
To merge this branch:	bzr merge lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-ssh-client-driver
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Santiago Baldassin (community)			Approve on 2017-03-08
platform-qa-bot	continuous-integration		Approve on 2017-03-07
Omer Akram (community)		2017-03-03	Approve on 2017-03-07
Review via email: mp+318948@code.launchpad.net