mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-05-24 08:51:31 +00:00
return britney output as well, and add some commented-out extra debugging
This commit is contained in:
parent
0f5d8cfdcc
commit
899417b78d
@ -202,7 +202,7 @@ args.func()
|
|||||||
'''Run britney.
|
'''Run britney.
|
||||||
|
|
||||||
Assert that it succeeds and does not produce anything on stderr.
|
Assert that it succeeds and does not produce anything on stderr.
|
||||||
Return generated excuses.html output.
|
Return (excuses.html, britney_out).
|
||||||
'''
|
'''
|
||||||
britney = subprocess.Popen([self.britney, '-c', self.britney_conf],
|
britney = subprocess.Popen([self.britney, '-c', self.britney_conf],
|
||||||
stdout=subprocess.PIPE,
|
stdout=subprocess.PIPE,
|
||||||
@ -216,7 +216,7 @@ args.func()
|
|||||||
with open(os.path.join(self.data.path, 'output', 'excuses.html')) as f:
|
with open(os.path.join(self.data.path, 'output', 'excuses.html')) as f:
|
||||||
excuses = f.read()
|
excuses = f.read()
|
||||||
|
|
||||||
return excuses
|
return (excuses, out)
|
||||||
|
|
||||||
def test_no_request_for_uninstallable(self):
|
def test_no_request_for_uninstallable(self):
|
||||||
'''Does not request a test for an uninstallable package'''
|
'''Does not request a test for an uninstallable package'''
|
||||||
@ -268,7 +268,11 @@ args.func()
|
|||||||
|
|
||||||
self.make_adt_britney(adt_request)
|
self.make_adt_britney(adt_request)
|
||||||
|
|
||||||
excuses = self.run_britney()
|
(excuses, out) = self.run_britney()
|
||||||
|
#print('-------\nexcuses: %s\n-----' % excuses)
|
||||||
|
#print('-------\nout: %s\n-----' % out)
|
||||||
|
#print('run:\n%s -c %s\n' % (self.britney, self.britney_conf))
|
||||||
|
#subprocess.call(['bash', '-i'], cwd=self.data.path)
|
||||||
if considered:
|
if considered:
|
||||||
self.assertIn('Valid candidate', excuses)
|
self.assertIn('Valid candidate', excuses)
|
||||||
else:
|
else:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user