← Back to branch summary

~ubuntu-branches/ubuntu/vivid/pkgbinarymangler/vivid

« back to all changes in this revision

Viewing changes to test/run

  • Committer: Martin Pitt
  • Date: 2012-09-25 13:18:47 UTC
  • Revision ID: martin.pitt@canonical.com-20120925131847-frzxafo10p5p26qx
pkgstripfiles: Remove buildinfo_<arch>.gz files as well. Update test/run
accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/run
194
194
                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
195
195
            out = dpkg.communicate()[0].decode()
196
196
            if expect_files:
197
 
                self.assertTrue('./usr/share/doc/%s/buildinfo.gz' % pkg in out)
 
197
                self.assertTrue('./usr/share/doc/%s/buildinfo' % pkg in out, out)
198
198
                self.assertTrue('./usr/share/doc/%s/changelog.gz' % pkg in out or 
199
199
                             './usr/share/doc/%s/changelog.Debian.gz' % pkg in out)
200
200
            else:
201
 
                self.assertFalse('./usr/share/doc/%s/buildinfo.gz' % pkg in out)
 
201
                self.assertFalse('/buildinfo' in out, out)
202
202
                if 'changelog.Debian.gz' in out:
203
203
                    self.assertFalse('changelog.gz' in out)
204
204
 
208
208
            out = out.decode()
209
209
            self.assertEqual(err, b'')
210
210
            if expect_files:
211
 
                self.assertTrue('usr/share/doc/%s/buildinfo.gz' % pkg in out)
 
211
                self.assertTrue('usr/share/doc/%s/buildinfo' % pkg in out)
212
212
                self.assertTrue('usr/share/doc/%s/changelog.gz' % pkg in out or 
213
213
                             'usr/share/doc/%s/changelog.Debian.gz' % pkg in out)
214
214
            else:
215
 
                self.assertFalse('buildinfo.gz' in out)
 
215
                self.assertFalse('buildinfo' in out)
216
216
                if 'changelog.Debian.gz' in out:
217
217
                    self.assertFalse('changelog.gz' in out)
218
218