Merge lp:~robru/cupstream2distro/fix-filterdiff-tests into lp:cupstream2distro

[Robert Bruce Park]

Fix filterdiff tests on wily.

[lp:~robru/cupstream2distro/fix-filterdiff-tests]

1127. By Robert Bruce Park on 2015-09-29

Fix filterdiff tests on wily.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1127
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/813/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/813/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/unit/test_packagemanager.py'
--- tests/unit/test_packagemanager.py	2015-09-28 21:49:55 +0000
+++ tests/unit/test_packagemanager.py	2015-09-29 19:02:18 +0000
@@ -302,7 +302,10 @@
             ])
         with utf8_open(self.pkg_diff_path) as pkg_diff:
             result = [line.split('\t')[0] for line in
-                      pkg_diff.read().strip().splitlines()]
+                      pkg_diff.read().strip().splitlines()
+                      # filterdiff includes 'diff -Nru' lines in wily but not
+                      # vivid or trusty, so this lets tests pass everywhere.
+                      if not line.startswith('diff -Nru')]
             self.assertEqual(result, [
                 '/!\\ Source package is a main component.',
                 '',