tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Debugging new framework"

Browse Source 
This reverts commit bfa03fbf74764e043e467fd469a8dfa915412de7.
This commit is contained in:
axl89 2016-08-22 11:09:38 +02:00
parent 9d420b5fdc
commit 08a2a15a76
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/run_console_tests.py
View File

@ -30,7 +30,6 @@ def split_suite_into_chunks(num_threads, suite):
if num_threads < 0: num_threads = 1 if num_threads < 0: num_threads = 1
if num_threads > 8: num_threads = 8 if num_threads > 8: num_threads = 8
num_tests = suite.countTestCases() num_tests = suite.countTestCases()
print "num_tests: "+str(num_tests)
s = [] s = []
s_tmp = ArticaTestSuite() s_tmp = ArticaTestSuite()
n = round(num_tests / num_threads) n = round(num_tests / num_threads)
@ -40,8 +39,6 @@ def split_suite_into_chunks(num_threads, suite):
num_threads -= 1 num_threads -= 1
num_tests -= s_tmp.countTestCases() num_tests -= s_tmp.countTestCases()
s_tmp = ArticaTestSuite() s_tmp = ArticaTestSuite()
print "num_tests: "+str(num_tests)
print "num_threads: "+str(num_threads)
n = round(num_tests / num_threads) n = round(num_tests / num_threads)
s_tmp.addTest(case) s_tmp.addTest(case)
n -= 1 n -= 1
@ -49,7 +46,6 @@ def split_suite_into_chunks(num_threads, suite):
if s_tmp.countTestCases() > 0: s.append([s_tmp, None]) if s_tmp.countTestCases() > 0: s.append([s_tmp, None])
num_tests -= s_tmp.countTestCases() num_tests -= s_tmp.countTestCases()
if num_tests != 0: print("Error: num_tests should be 0 but is %s!" % num_tests) if num_tests != 0: print("Error: num_tests should be 0 but is %s!" % num_tests)
print "The length of s is: "+str(len(s))
return s return s
class TracingStreamResult(testtools.StreamResult): class TracingStreamResult(testtools.StreamResult):
@ -85,7 +81,6 @@ if is_enterprise:
num_threads = 2 num_threads = 2
else: else:
num_threads = 3 num_threads = 3
a = ArticaTestLoader() a = ArticaTestLoader()
#Network server tests #Network server tests
@ -95,7 +90,6 @@ print str(tests.countTestCases())+" tests found"
print "Using "+str(num_threads)+" threads" print "Using "+str(num_threads)+" threads"
concurrent_suite = testtools.ConcurrentStreamTestSuite(lambda: (split_suite_into_chunks(num_threads, tests))) concurrent_suite = testtools.ConcurrentStreamTestSuite(lambda: (split_suite_into_chunks(num_threads, tests)))
#concurrent_suite = testtools.ConcurrentStreamTestSuite(tests)
result = TracingStreamResult() result = TracingStreamResult()