Commit ce27c48a authored by Romain Courteaud's avatar Romain Courteaud

root_state property is deprecated

parent 1d1eed55
...@@ -159,7 +159,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -159,7 +159,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
state="started", state="started",
) )
hosting_subscription = person.REQUEST.get('request_hosting_subscription') hosting_subscription = person.REQUEST.get('request_hosting_subscription')
self.assertEquals("started", hosting_subscription.getRootState()) self.assertEquals("started", hosting_subscription.getSlapState())
person.requestSoftwareInstance( person.requestSoftwareInstance(
software_release=software_release, software_release=software_release,
...@@ -171,7 +171,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -171,7 +171,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
state="stopped", state="stopped",
) )
hosting_subscription = person.REQUEST.get('request_hosting_subscription') hosting_subscription = person.REQUEST.get('request_hosting_subscription')
self.assertEquals("stopped", hosting_subscription.getRootState()) self.assertEquals("stopped", hosting_subscription.getSlapState())
person.requestSoftwareInstance( person.requestSoftwareInstance(
software_release=software_release, software_release=software_release,
...@@ -183,7 +183,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -183,7 +183,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
state="destroyed", state="destroyed",
) )
hosting_subscription = person.REQUEST.get('request_hosting_subscription') hosting_subscription = person.REQUEST.get('request_hosting_subscription')
self.assertEquals("destroyed", hosting_subscription.getRootState()) self.assertEquals("destroyed", hosting_subscription.getSlapState())
def test_Person_requestSoftwareInstance_returnHostingSubscriptionUrl(self): def test_Person_requestSoftwareInstance_returnHostingSubscriptionUrl(self):
person = self.getPortalObject().ERP5Site_getAuthenticatedMemberPersonValue() person = self.getPortalObject().ERP5Site_getAuthenticatedMemberPersonValue()
...@@ -241,7 +241,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -241,7 +241,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
self.assertEquals(instance_xml, hosting_subscription.getTextContent()) self.assertEquals(instance_xml, hosting_subscription.getTextContent())
self.assertEquals(sla_xml, hosting_subscription.getSlaXml()) self.assertEquals(sla_xml, hosting_subscription.getSlaXml())
self.assertEquals(shared, hosting_subscription.getRootSlave()) self.assertEquals(shared, hosting_subscription.getRootSlave())
self.assertEquals(state, hosting_subscription.getRootState()) self.assertEquals(state, hosting_subscription.getSlapState())
self.assertEquals("HOSTSUBS-%s" % (previous_id+1), self.assertEquals("HOSTSUBS-%s" % (previous_id+1),
hosting_subscription.getReference()) hosting_subscription.getReference())
self.assertEquals("validated", hosting_subscription.getValidationState()) self.assertEquals("validated", hosting_subscription.getValidationState())
...@@ -334,7 +334,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -334,7 +334,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
self.assertEquals(instance_xml2, hosting_subscription.getTextContent()) self.assertEquals(instance_xml2, hosting_subscription.getTextContent())
self.assertEquals(sla_xml2, hosting_subscription.getSlaXml()) self.assertEquals(sla_xml2, hosting_subscription.getSlaXml())
self.assertEquals(shared2, hosting_subscription.getRootSlave()) self.assertEquals(shared2, hosting_subscription.getRootSlave())
self.assertEquals(state2, hosting_subscription.getRootState()) self.assertEquals(state2, hosting_subscription.getSlapState())
self.assertEquals("validated", hosting_subscription.getValidationState()) self.assertEquals("validated", hosting_subscription.getValidationState())
def test_Person_requestSoftwareInstance_duplicatedHostingSubscription(self): def test_Person_requestSoftwareInstance_duplicatedHostingSubscription(self):
...@@ -432,7 +432,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -432,7 +432,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
self.assertEquals(instance_xml2, hosting_subscription2.getTextContent()) self.assertEquals(instance_xml2, hosting_subscription2.getTextContent())
self.assertEquals(sla_xml2, hosting_subscription2.getSlaXml()) self.assertEquals(sla_xml2, hosting_subscription2.getSlaXml())
self.assertEquals(shared2, hosting_subscription2.getRootSlave()) self.assertEquals(shared2, hosting_subscription2.getRootSlave())
self.assertEquals(state2, hosting_subscription2.getRootState()) self.assertEquals(state2, hosting_subscription2.getSlapState())
self.assertEquals("validated", hosting_subscription2.getValidationState()) self.assertEquals("validated", hosting_subscription2.getValidationState())
def test_Person_requestSoftwareInstance_noConflictWithDeletedHostingSubscription(self): def test_Person_requestSoftwareInstance_noConflictWithDeletedHostingSubscription(self):
...@@ -455,7 +455,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -455,7 +455,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
state="destroyed", state="destroyed",
) )
hosting_subscription = person.REQUEST.get('request_hosting_subscription') hosting_subscription = person.REQUEST.get('request_hosting_subscription')
self.assertEquals("destroyed", hosting_subscription.getRootState()) self.assertEquals("destroyed", hosting_subscription.getSlapState())
transaction.commit() transaction.commit()
self.tic() self.tic()
...@@ -469,6 +469,6 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase): ...@@ -469,6 +469,6 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
state="started", state="started",
) )
hosting_subscription2 = person.REQUEST.get('request_hosting_subscription') hosting_subscription2 = person.REQUEST.get('request_hosting_subscription')
self.assertEquals("started", hosting_subscription2.getRootState()) self.assertEquals("started", hosting_subscription2.getSlapState())
self.assertNotEquals(hosting_subscription.getRelativeUrl(), self.assertNotEquals(hosting_subscription.getRelativeUrl(),
hosting_subscription2.getRelativeUrl()) hosting_subscription2.getRelativeUrl())
3 4
\ No newline at end of file \ No newline at end of file
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