Merge "Skip test for testr hook being installed when testr is not available"
This commit is contained in:
commit
73a763d1e3
|
@ -41,7 +41,9 @@
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
from testtools import skipUnless
|
||||||
|
|
||||||
|
from pbr import testr_command
|
||||||
from pbr.tests import base
|
from pbr.tests import base
|
||||||
from pbr.tests import util
|
from pbr.tests import util
|
||||||
|
|
||||||
|
@ -66,6 +68,7 @@ class TestHooks(base.BaseTestCase):
|
||||||
assert 'test_hook_1\ntest_hook_2' in stdout
|
assert 'test_hook_1\ntest_hook_2' in stdout
|
||||||
assert return_code == 0
|
assert return_code == 0
|
||||||
|
|
||||||
|
@skipUnless(testr_command.have_testr, "testrepository not available")
|
||||||
def test_custom_commands_known(self):
|
def test_custom_commands_known(self):
|
||||||
stdout, _, return_code = self.run_setup('--help-commands')
|
stdout, _, return_code = self.run_setup('--help-commands')
|
||||||
self.assertFalse(return_code)
|
self.assertFalse(return_code)
|
||||||
|
|
Loading…
Reference in New Issue