Commit 36df6014 authored by Romain Courteaud's avatar Romain Courteaud

slapos_slap_tool: project reference

parent 188e459a
...@@ -1995,6 +1995,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1995,6 +1995,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
filter_xml='<marshal><dictionary id="i2"/></marshal>', filter_xml='<marshal><dictionary id="i2"/></marshal>',
state='<marshal><string>started</string></marshal>', state='<marshal><string>started</string></marshal>',
shared_xml='<marshal><bool>1</bool></marshal>', shared_xml='<marshal><bool>1</bool></marshal>',
project_reference=self.project.getReference()
) )
self.assertEqual(408, response.status) self.assertEqual(408, response.status)
self.assertEqual('private', self.assertEqual('private',
...@@ -2006,7 +2007,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -2006,7 +2007,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
'state': 'started', 'state': 'started',
'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n", 'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n",
'software_type': 'req_type', 'software_type': 'req_type',
'shared': True}) 'shared': True,
'project_reference': self.project.getReference()
})
finally: finally:
if os.path.exists(self.instance_request_simulator): if os.path.exists(self.instance_request_simulator):
os.unlink(self.instance_request_simulator) os.unlink(self.instance_request_simulator)
...@@ -2030,6 +2033,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -2030,6 +2033,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
filter_xml='<marshal><dictionary id="i2"/></marshal>', filter_xml='<marshal><dictionary id="i2"/></marshal>',
state='<marshal><string>started</string></marshal>', state='<marshal><string>started</string></marshal>',
shared_xml='<marshal><bool>0</bool></marshal>', shared_xml='<marshal><bool>0</bool></marshal>',
project_reference=self.project.getReference()
) )
self.assertEqual(408, response.status) self.assertEqual(408, response.status)
self.assertEqual('private', self.assertEqual('private',
...@@ -2041,7 +2045,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -2041,7 +2045,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
'state': 'started', 'state': 'started',
'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n", 'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n",
'software_type': 'req_type', 'software_type': 'req_type',
'shared': False}) 'shared': False,
'project_reference': self.project.getReference()
})
finally: finally:
if os.path.exists(self.instance_request_simulator): if os.path.exists(self.instance_request_simulator):
os.unlink(self.instance_request_simulator) os.unlink(self.instance_request_simulator)
...@@ -2065,6 +2071,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -2065,6 +2071,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
filter_xml='<marshal><dictionary id="i2"/></marshal>', filter_xml='<marshal><dictionary id="i2"/></marshal>',
state='<marshal><string>started</string></marshal>', state='<marshal><string>started</string></marshal>',
shared_xml='<marshal><bool>0</bool></marshal>', shared_xml='<marshal><bool>0</bool></marshal>',
project_reference=self.project.getReference()
) )
self.assertEqual(408, response.status) self.assertEqual(408, response.status)
self.assertEqual('private', self.assertEqual('private',
...@@ -2076,7 +2083,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -2076,7 +2083,9 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
'state': 'stopped', 'state': 'stopped',
'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n", 'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n",
'software_type': 'req_type', 'software_type': 'req_type',
'shared': False}) 'shared': False,
'project_reference': self.project.getReference()
})
finally: finally:
if os.path.exists(self.instance_request_simulator): if os.path.exists(self.instance_request_simulator):
os.unlink(self.instance_request_simulator) os.unlink(self.instance_request_simulator)
...@@ -3052,6 +3061,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -3052,6 +3061,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
filter_xml='<marshal><dictionary id="i2"/></marshal>', filter_xml='<marshal><dictionary id="i2"/></marshal>',
state='<marshal><string>started</string></marshal>', state='<marshal><string>started</string></marshal>',
shared_xml='<marshal><bool>1</bool></marshal>', shared_xml='<marshal><bool>1</bool></marshal>',
project_reference=self.project.getReference()
) )
self.assertEqual(408, response.status) self.assertEqual(408, response.status)
self.assertEqual('private', self.assertEqual('private',
...@@ -3063,7 +3073,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -3063,7 +3073,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
'state': 'started', 'state': 'started',
'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n", 'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n",
'software_type': 'req_type', 'software_type': 'req_type',
'shared': True}) 'shared': True,
'project_reference': self.project.getReference()
})
finally: finally:
if os.path.exists(self.instance_request_simulator): if os.path.exists(self.instance_request_simulator):
os.unlink(self.instance_request_simulator) os.unlink(self.instance_request_simulator)
...@@ -3082,6 +3094,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -3082,6 +3094,7 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
filter_xml='<marshal><dictionary id="i2"/></marshal>', filter_xml='<marshal><dictionary id="i2"/></marshal>',
state='<marshal><string>started</string></marshal>', state='<marshal><string>started</string></marshal>',
shared_xml='<marshal><bool>0</bool></marshal>', shared_xml='<marshal><bool>0</bool></marshal>',
project_reference=self.project.getReference()
) )
self.assertEqual(408, response.status) self.assertEqual(408, response.status)
self.assertEqual('private', self.assertEqual('private',
...@@ -3093,7 +3106,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -3093,7 +3106,9 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
'state': 'started', 'state': 'started',
'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n", 'sla_xml': "<?xml version='1.0' encoding='utf-8'?>\n<instance/>\n",
'software_type': 'req_type', 'software_type': 'req_type',
'shared': False}) 'shared': False,
'project_reference': self.project.getReference()
})
finally: finally:
if os.path.exists(self.instance_request_simulator): if os.path.exists(self.instance_request_simulator):
os.unlink(self.instance_request_simulator) os.unlink(self.instance_request_simulator)
......
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