Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/fix-list-registered-debug into lp:snappy-ecosystem-tests

[Omer Akram]

list_registered: fix debug logic

list_registered: fix debug logic

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

FAILED: Continuous integration, rev:54
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/317/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2246/console

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

review: Needs Fixing (continuous-integration)

[Omer Akram (om26er)]

test results: https://platform-qa-jenkins.ubuntu.com/job/run_snappy_ecosystem_tests/124/artifact/snappy-ecosystem-tests/snappy-ecosystem-results.xml/*view*/

Note the two failing tests are irrelevant here and are being looked into right now.

[lp:~canonical-platform-qa/snappy-ecosystem-tests/fix-list-registered-debug]

55. By Omer Akram on 2017-03-30

pylint happy happy

[Omer Akram (om26er)]

Actually one of the failure is regarding chromedriver, for that I need to know what packages need to be installed in the slave. So there really is a single failure, which is unrelated.

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

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

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

review: Approve (continuous-integration)

[Heber Parrucci (heber013)]

LGTM

review: Approve

[Omer Akram (om26er)]

Great, lets land it then.

=== modified file 'snappy_ecosystem_tests/helpers/snapcraft/client.py'
--- snappy_ecosystem_tests/helpers/snapcraft/client.py	2017-03-17 10:28:21 +0000
+++ snappy_ecosystem_tests/helpers/snapcraft/client.py	2017-03-30 16:50:37 +0000
@@ -188,9 +188,16 @@
         if raw:
             return registered_snaps_output
         else:
+            def discard_debug_lines(output_lines):
+                """Only return non-debug lines."""
+                for index, line in enumerate(output_lines):
+                    if 'Name' and 'Since' in line:
+                        return output_lines[index:]
             snaps = registered_snaps_output.splitlines()
-            # if debug is set, the first 3 lines of output are the API calls
-            return parse_snaps_raw(snaps if debug is False else snaps[3:])
+            # if debug is set, the first few lines of output are the API calls,
+            # lets discard them.
+            return parse_snaps_raw(
+                discard_debug_lines(snaps) if debug else snaps)
 
     def filter_snaps(self, **predicates):
         """