Skip to content
Snippets Groups Projects
Commit 45a82144 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Test suite: 'rutnime skip' to 'skip', 'skip' to 'disabled'.

@todo: write the reason why we skip a test when we skip it.
parent c04b8a93
No related branches found
No related tags found
No related merge requests found
...@@ -147,7 +147,7 @@ class Test: ...@@ -147,7 +147,7 @@ class Test:
check_valgrind_log(server.valgrind_log) == False check_valgrind_log(server.valgrind_log) == False
if self.skip: if self.skip:
print "[ runtime skip ]" print "[ skip ]"
elif self.is_executed_ok and self.is_equal_result and self.is_valgrind_clean: elif self.is_executed_ok and self.is_equal_result and self.is_valgrind_clean:
print "[ pass ]" print "[ pass ]"
...@@ -303,11 +303,11 @@ class TestSuite: ...@@ -303,11 +303,11 @@ class TestSuite:
test_name = os.path.basename(test.name) test_name = os.path.basename(test.name)
if test_name in self.ini["disabled"]: if test_name in self.ini["disabled"]:
print "[ skip ]" print "[ disabled ]"
elif not server.debug and test_name in self.ini["release_disabled"]: elif not server.debug and test_name in self.ini["release_disabled"]:
print "[ skip ]" print "[ disabled ]"
elif self.args.valgrind and test_name in self.ini["valgrind_disabled"]: elif self.args.valgrind and test_name in self.ini["valgrind_disabled"]:
print "[ skip ]" print "[ disabled ]"
else: else:
test.run(server) test.run(server)
if not test.passed(): if not test.passed():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment