summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-15 18:04:08 +0000
committerGerrit Code Review <review@openstack.org>2018-10-15 18:04:08 +0000
commit73a763d1e3cb2f00c2dc4fbfecfab487f9698818 (patch)
tree543e03c957677a9e1726b3183fd112555ca947fa
parent4788f49ec0957211f1e72d0909ad5a0b76cb3acd (diff)
parenta4f27ca3972f88e1f494a95ac74fb0c582dd59dd (diff)
Merge "Skip test for testr hook being installed when testr is not available"5.0.0
-rw-r--r--pbr/tests/test_hooks.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pbr/tests/test_hooks.py b/pbr/tests/test_hooks.py
index 0fcf96c..3f74790 100644
--- a/pbr/tests/test_hooks.py
+++ b/pbr/tests/test_hooks.py
@@ -41,7 +41,9 @@
41import os 41import os
42 42
43from testtools import matchers 43from testtools import matchers
44from testtools import skipUnless
44 45
46from pbr import testr_command
45from pbr.tests import base 47from pbr.tests import base
46from pbr.tests import util 48from pbr.tests import util
47 49
@@ -66,6 +68,7 @@ class TestHooks(base.BaseTestCase):
66 assert 'test_hook_1\ntest_hook_2' in stdout 68 assert 'test_hook_1\ntest_hook_2' in stdout
67 assert return_code == 0 69 assert return_code == 0
68 70
71 @skipUnless(testr_command.have_testr, "testrepository not available")
69 def test_custom_commands_known(self): 72 def test_custom_commands_known(self):
70 stdout, _, return_code = self.run_setup('--help-commands') 73 stdout, _, return_code = self.run_setup('--help-commands')
71 self.assertFalse(return_code) 74 self.assertFalse(return_code)