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

[Heber Parrucci]

Fix snapcraft logout

Fix snapcraft logout

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:35
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/241/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2046/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/241/rebuild

review: Approve (continuous-integration)

[I Ahmad (iahmad)]

Looks good and working when tested locally

review: Approve

=== modified file 'snappy_ecosystem_tests/helpers/snapcraft/client.py'
--- snappy_ecosystem_tests/helpers/snapcraft/client.py	2017-03-02 14:13:12 +0000
+++ snappy_ecosystem_tests/helpers/snapcraft/client.py	2017-03-03 14:11:14 +0000
@@ -24,8 +24,6 @@
 import subprocess
 import time
 
-import pexpect
-
 from snappy_ecosystem_tests.models.snap import Snap
 from snappy_ecosystem_tests.utils import ssh
 from snappy_ecosystem_tests.utils.commands import build_command
@@ -56,6 +54,7 @@
 """
 
 COMMAND_LOGOUT = 'logout'
+
 COMMAND_REGISTER = 'register'
 COMMAND_LIST_REGISTERED = 'list-registered'
 
@@ -113,16 +112,13 @@
         """Perform cleanup actions"""
         self.logout()
 
-    def logout(self):
-        """logout of snapcraft store session"""
-        child = pexpect.spawn(build_snapcraft_command(COMMAND_LOGOUT))
-        err = child.expect('Credentials cleared.')
-        child.terminate(True)
-        child.wait()
-        if err is not 0:
-            raise ValueError("Failed to logout")
-
-        self._login = False
+    @staticmethod
+    def logout():
+        """logout of snapcraft store session
+        :return: True if logout was successful, False otherwise
+        """
+        Snapcraft._run_snapcraft_command_ssh(COMMAND_LOGOUT)
+        return not Snapcraft.is_logged_in()
 
     @staticmethod
     def login(email=LOGIN_EMAIL, password=LOGIN_PASSWORD):