Skip to content

Commit 481a96c

Browse files
committed
Changed the handling of skip tests and messages in order to show which tests will be skipped, and why, at the start of a test run.
- Legacy-Id: 12568
1 parent 4219315 commit 481a96c

4 files changed

Lines changed: 16 additions & 10 deletions

File tree

ietf/group/tests.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
skip_dot_to_pdf = False
2828
skip_message = ""
2929
else:
30+
import sys
3031
skip_dot_to_pdf = True
31-
skip_message = ("One or more of the binaries for dot, unflatten and ps2pdf weren't found "
32-
"in the locations indicated in settings.py.")
32+
skip_message = ("Skipping dependency graph tests: One or more of the binaries for dot\n "
33+
"and unflatten weren't found in the locations indicated in settings.py")
34+
sys.stderr.write(" "+skip_message+'\n')
3335

3436
class StreamTests(TestCase):
3537
def test_streams(self):

ietf/ietfauth/tests.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
skip_htpasswd_command = False
2828
skip_message = ""
2929
else:
30+
import sys
3031
skip_htpasswd_command = True
31-
skip_message = ("The binary for htpasswd wasn't found "
32-
"in the locations indicated in settings.py.")
32+
skip_message = ("Skipping htpasswd test: The binary for htpasswd wasn't found in the\n "
33+
"location indicated in settings.py.")
34+
sys.stderr.write(" "+skip_message+'\n')
3335

3436
class IetfAuthTests(TestCase):
3537
def setUp(self):

ietf/meeting/tests_js.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
from selenium.webdriver.common.action_chains import ActionChains
3131
except ImportError as e:
3232
skip_selenium = True
33-
skip_message = " Skipping selenium tests: %s" % e
33+
skip_message = "Skipping selenium tests: %s" % e
3434
code, out, err = pipe('phantomjs -v')
3535
if not code == 0:
3636
skip_selenium = True
37-
skip_message = " Skipping selenium tests: 'phantomjs' executable not found."
37+
skip_message = "Skipping selenium tests: 'phantomjs' executable not found."
3838
if skip_selenium:
39-
sys.stderr.write(skip_message+'\n')
39+
sys.stderr.write(" "+skip_message+'\n')
4040

4141
def condition_data():
4242
make_meeting_test_data()

ietf/utils/tests.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@
3030
from ietf.group.models import Group
3131

3232
skip_wiki_glue_testing = False
33-
skip_wiki_glue_message = ""
33+
skip_message = ""
3434
try:
3535
import svn # pyflakes:ignore
3636
except ImportError as e:
37+
import sys
3738
skip_wiki_glue_testing = True
38-
skip_wiki_glue_message = " Skipping trac tests: %s" % e
39+
skip_message = "Skipping trac tests: %s" % e
40+
sys.stderr.write(" "+skip_message+'\n')
3941

4042
class PyFlakesTestCase(TestCase):
4143

@@ -205,7 +207,7 @@ def check_that_static_tags_resolve(node, origin, checked):
205207
settings.DEBUG = saved_debug
206208

207209

208-
@skipIf(skip_wiki_glue_testing, skip_wiki_glue_message)
210+
@skipIf(skip_wiki_glue_testing, skip_message)
209211
class TestWikiGlueManagementCommand(TestCase):
210212

211213
def setUp(self):

0 commit comments

Comments
 (0)