Commit f62a5290 authored by Jérome Perrin's avatar Jérome Perrin

test_result: add Reference property sheet on Test Suite Repository

This property sheet was missing, but test passed because both the
setSourceReference and getSourceReference were acquired
parent 041b0614
Pipeline #6985 running with stage
......@@ -64,6 +64,7 @@
</portal_type>
<portal_type id="Test Suite Repository">
<item>Arrow</item>
<item>Reference</item>
<item>TestSuiteRepository</item>
<item>TestSuiteRepositoryConstraint</item>
</portal_type>
......
from Products.DCWorkflow.DCWorkflow import ValidationFailed
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
import json
import json
from time import sleep
from DateTime import DateTime
import responses
......@@ -75,7 +75,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
original_class = self.distributor.__class__
original_scalability_class = self.scalability_distributor.__class__
original_performance_class = self.performance_distributor.__class__
original_class._getTestNodeModule = self._original_getTestNodeModule
original_class._getTestSuiteModule = self._original_getTestSuiteModule
original_scalability_class._getTestNodeModule = self._original_getTestNodeModule
......@@ -133,7 +133,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
)
test_suite.validate()
test_suite_list.append(test_suite)
return test_suite_list
return test_suite_list
def test_01_createTestNode(self):
test_node = self._createTestNode()[0]
......@@ -855,7 +855,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
Is this really useful and used ?
"""
self._checkCreateTestResultAndAllowRestart()
self._checkCreateTestResultAndAllowRestart()
def test_09b_checkCreateTestResultAndAllowRestartWithTic(self):
"""
......@@ -910,7 +910,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
check = self._checkTestSuiteAggregateList
check([test_node_one, ["one"]],
[test_node_two, ["two"]])
# first test suite is invalidated, so it should be removed from nodes,
# first test suite is invalidated, so it should be removed from nodes,
# but this should not change assignment of second test suite
test_suite_one.invalidate()
check([test_node_one, []],
......@@ -1036,7 +1036,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
self.tool.TestTaskDistribution.setMaxTestSuite(10)
self._callOptimizeAlarm()
self.assertEqual(5, len(set(test_node.getAggregateList())))
self.assertEqual(set(test_node.getAggregateList()),
self.assertEqual(set(test_node.getAggregateList()),
set([x.getRelativeUrl() for x in test_suite_list]))
def test_12_checkCloudPerformanceOptimizationIsStable(self):
......@@ -1056,7 +1056,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
check = self._checkTestSuiteAggregateList
check([test_node_one, ["one", "two"]],
[test_node_two, ["one", "two"]])
# first test suite is invalidated, so it should be removed from nodes,
# first test suite is invalidated, so it should be removed from nodes,
# but this should not change assignment of second test suite
test_suite_one.invalidate()
check([test_node_one, ["two"]],
......@@ -1124,7 +1124,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
Check test node subscription.
"""
test_node_module = self.test_node_module
# Generate informations for nodes to subscribe
nodes = dict([("COMP%d-Scalability-Node_test14" %i, "COMP-%d" %i) for i in range(0,5)])
# Subscribe nodes
......@@ -1147,7 +1147,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
- Check the master election
"""
test_node_module = self.test_node_module
## 1 (check election, classic)
# Subscribe nodes
self.scalability_distributor.subscribeNode("COMP1-Scalability-Node1", computer_guid="COMP-1")
......@@ -1172,10 +1172,10 @@ class TestTaskDistribution(ERP5TypeTestCase):
self.assertEquals(1, len(master_test_node_list))
# -Others test node must not be the matser
self.assertEquals(3, len(slave_test_node_list))
# Get the current master test node
# Get the current master test node
current_master_test_node_1 = master_test_node_list[0]
## 2 (check election, with adding new nodes)
# Add new nodes
self.scalability_distributor.subscribeNode("COMP5-Scalability-Node5", computer_guid="COMP-5")
......@@ -1204,12 +1204,12 @@ class TestTaskDistribution(ERP5TypeTestCase):
# -Others test node must not be the matser
self.assertEquals(4, len(slave_test_node_list))
# Get the current master test node
# Get the current master test node
current_master_test_node_3 = master_test_node_list[0]
# Master test node must be an other test node than previously
self.assertNotEquals(current_master_test_node_2.getTitle(),
self.assertNotEquals(current_master_test_node_2.getTitle(),
current_master_test_node_3.getTitle())
def test_16_startTestSuiteERP5ScalabilityDistributor(self):
"""
......@@ -1225,12 +1225,12 @@ class TestTaskDistribution(ERP5TypeTestCase):
self.scalability_distributor.subscribeNode("COMP4-Scalability-Node4", computer_guid="COMP-4")
# Create test suite
self._createTestSuite(quantity=1,priority=1, reference_correction=0,
specialise_value=self.scalability_distributor, portal_type="Scalability Test Suite")
specialise_value=self.scalability_distributor, portal_type="Scalability Test Suite")
self.tic()
self._callOptimizeAlarm()
# Get current master test node
master_test_nodes = [x for x in test_node_module.searchFolder()\
if (x.getMaster() == True and x.getValidationState() == "validated")]
if (x.getMaster() == True and x.getValidationState() == "validated")]
current_master_test_node = master_test_nodes[0]
self.tic()
# Each node run startTestSuite
......@@ -1272,7 +1272,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
# Optimize configuration
self.scalability_distributor.optimizeConfiguration()
self.tic()
# Get test nodes
# Get test nodes
master_test_nodes = [x for x in test_node_module.searchFolder()
if (x.getMaster() == True and x.getValidationState() == 'validated')]
slave_test_nodes = [x for x in test_node_module.searchFolder()
......@@ -1306,7 +1306,7 @@ class TestTaskDistribution(ERP5TypeTestCase):
partition_dict += ' "instance-count": {{ count }},\n'
partition_dict += ' "family": "%s",\n' %family_name
partition_dict += ' "computer_guid": "%s"\n' %node_list[j][0]
partition_dict += '}'
partition_dict += '}'
if j != i-1:
partition_dict += ',\n'
else:
......@@ -1339,9 +1339,9 @@ class TestTaskDistribution(ERP5TypeTestCase):
# break
# # Get configuration list generated from test suite
## configuration_list = self.scalability_distributor.generateConfiguration(test_suite_title)
#
#
# # logs
## log(configuration_list)
## log(configuration_list)
def test_19_testMultiDistributor(self):
pass
......@@ -1644,8 +1644,8 @@ class TestGitlabRESTConnectorInterface(ERP5TypeTestCase):
self.tic()
def test_status_per_test_result_line(self):
self.test_suite.test_repo.setSourceReference(
'test_result_line')
self.test_suite.test_repo.edit(
source_reference='test_result_line')
self.test_result.newContent(
portal_type='Test Result Line',
title='this test_result_line is OK',
......@@ -1672,8 +1672,8 @@ class TestGitlabRESTConnectorInterface(ERP5TypeTestCase):
self.tic()
def test_status_per_test_result_line_multiple_matches(self):
self.test_suite.test_repo.setSourceReference(
'test_result_line')
self.test_suite.test_repo.edit(
source_reference='test_result_line')
self.test_result.newContent(
portal_type='Test Result Line',
title='this test_result_line is OK',
......
......@@ -27,6 +27,7 @@ Test Result | Comment
Test Result | SortIndex
Test Result | Task
Test Suite Repository | Arrow
Test Suite Repository | Reference
Test Suite Repository | TestSuiteRepository
Test Suite Repository | TestSuiteRepositoryConstraint
Test Suite | Arrow
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment