Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Roque
slapos.core
Commits
fbe6c179
Commit
fbe6c179
authored
Mar 29, 2018
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapTool: fix test after previous changes on access status
parent
bcd8c217
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
1 deletion
+29
-1
master/bt5/slapos_slap_tool/TestTemplateItem/portal_components/test.erp5.testSlapOSSlapTool.py
...ateItem/portal_components/test.erp5.testSlapOSSlapTool.py
+29
-1
No files found.
master/bt5/slapos_slap_tool/TestTemplateItem/portal_components/test.erp5.testSlapOSSlapTool.py
View file @
fbe6c179
...
@@ -129,6 +129,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
...
@@ -129,6 +129,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<unicode>partition3</unicode>
<unicode>partition3</unicode>
</tuple>
</tuple>
<dictionary id='i8'>
<dictionary id='i8'>
<string>_access_status</string>
<string>%(access_status)s</string>
<string>_computer_id</string>
<string>_computer_id</string>
<unicode>%(computer_id)s</unicode>
<unicode>%(computer_id)s</unicode>
<string>_connection_dict</string>
<string>_connection_dict</string>
...
@@ -157,6 +159,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
...
@@ -157,6 +159,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
</list>
</list>
<unicode>paramé</unicode>
<unicode>paramé</unicode>
<unicode>%(partition_3_param)s</unicode>
<unicode>%(partition_3_param)s</unicode>
<string>root_instance_short_title</string>
<unicode/>
<string>root_instance_title</string>
<string>root_instance_title</string>
<unicode>%(partition_3_root_instance_title)s</unicode>
<unicode>%(partition_3_root_instance_title)s</unicode>
<string>slap_computer_id</string>
<string>slap_computer_id</string>
...
@@ -201,6 +205,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
...
@@ -201,6 +205,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<unicode>partition2</unicode>
<unicode>partition2</unicode>
</tuple>
</tuple>
<dictionary id='i19'>
<dictionary id='i19'>
<string>_access_status</string>
<string>%(access_status)s</string>
<string>_computer_id</string>
<string>_computer_id</string>
<unicode>%(computer_id)s</unicode>
<unicode>%(computer_id)s</unicode>
<string>_connection_dict</string>
<string>_connection_dict</string>
...
@@ -229,6 +235,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
...
@@ -229,6 +235,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
</list>
</list>
<unicode>paramé</unicode>
<unicode>paramé</unicode>
<unicode>%(partition_2_param)s</unicode>
<unicode>%(partition_2_param)s</unicode>
<string>root_instance_short_title</string>
<unicode/>
<string>root_instance_title</string>
<string>root_instance_title</string>
<unicode>%(partition_2_root_instance_title)s</unicode>
<unicode>%(partition_2_root_instance_title)s</unicode>
<string>slap_computer_id</string>
<string>slap_computer_id</string>
...
@@ -273,6 +281,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
...
@@ -273,6 +281,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
<unicode>partition1</unicode>
<unicode>partition1</unicode>
</tuple>
</tuple>
<dictionary id='i30'>
<dictionary id='i30'>
<string>_access_status</string>
<string>%(access_status)s</string>
<string>_computer_id</string>
<string>_computer_id</string>
<unicode>%(computer_id)s</unicode>
<unicode>%(computer_id)s</unicode>
<string>_connection_dict</string>
<string>_connection_dict</string>
...
@@ -301,6 +311,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
...
@@ -301,6 +311,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
</list>
</list>
<unicode>paramé</unicode>
<unicode>paramé</unicode>
<unicode>%(partition_1_param)s</unicode>
<unicode>%(partition_1_param)s</unicode>
<string>root_instance_short_title</string>
<unicode/>
<string>root_instance_title</string>
<string>root_instance_title</string>
<unicode>%(partition_1_root_instance_title)s</unicode>
<unicode>%(partition_1_root_instance_title)s</unicode>
<string>slap_computer_id</string>
<string>slap_computer_id</string>
...
@@ -422,7 +434,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
...
@@ -422,7 +434,8 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
slave_1_software_type
=
self
.
start_requested_slave_instance
.
getSourceReference
(),
slave_1_software_type
=
self
.
start_requested_slave_instance
.
getSourceReference
(),
slave_1_instance_guid
=
self
.
start_requested_slave_instance
.
getReference
(),
slave_1_instance_guid
=
self
.
start_requested_slave_instance
.
getReference
(),
slave_1_title
=
self
.
start_requested_slave_instance
.
getTitle
(),
slave_1_title
=
self
.
start_requested_slave_instance
.
getTitle
(),
start_requested_url
=
self
.
start_requested_software_installation
.
getUrlString
()
start_requested_url
=
self
.
start_requested_software_installation
.
getUrlString
(),
access_status
=
"#error no data found!"
,
)
)
self
.
assertEqual
(
expected_xml
,
got_xml
,
self
.
assertEqual
(
expected_xml
,
got_xml
,
'
\
n
'
.
join
([
q
for
q
in
difflib
.
unified_diff
(
expected_xml
.
split
(
'
\
n
'
),
got_xml
.
split
(
'
\
n
'
))]))
'
\
n
'
.
join
([
q
for
q
in
difflib
.
unified_diff
(
expected_xml
.
split
(
'
\
n
'
),
got_xml
.
split
(
'
\
n
'
))]))
...
@@ -961,6 +974,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
...
@@ -961,6 +974,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<unicode>partition1</unicode>
<unicode>partition1</unicode>
</tuple>
</tuple>
<dictionary id='i6'>
<dictionary id='i6'>
<string>_access_status</string>
<string>%(access_status)s</string>
<string>_computer_id</string>
<string>_computer_id</string>
<unicode>%(computer_id)s</unicode>
<unicode>%(computer_id)s</unicode>
<string>_connection_dict</string>
<string>_connection_dict</string>
...
@@ -989,6 +1004,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
...
@@ -989,6 +1004,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
</list>
</list>
<unicode>paramé</unicode>
<unicode>paramé</unicode>
<unicode>%(param)s</unicode>
<unicode>%(param)s</unicode>
<string>root_instance_short_title</string>
<unicode/>
<string>root_instance_title</string>
<string>root_instance_title</string>
<unicode>%(root_instance_title)s</unicode>
<unicode>%(root_instance_title)s</unicode>
<string>slap_computer_id</string>
<string>slap_computer_id</string>
...
@@ -1060,6 +1077,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
...
@@ -1060,6 +1077,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
slave_1_software_type
=
self
.
start_requested_slave_instance
.
getSourceReference
(),
slave_1_software_type
=
self
.
start_requested_slave_instance
.
getSourceReference
(),
slave_1_instance_guid
=
self
.
start_requested_slave_instance
.
getReference
(),
slave_1_instance_guid
=
self
.
start_requested_slave_instance
.
getReference
(),
slave_1_title
=
self
.
start_requested_slave_instance
.
getTitle
(),
slave_1_title
=
self
.
start_requested_slave_instance
.
getTitle
(),
access_status
=
"#error no data found!"
,
)
)
self
.
assertEqual
(
expected_xml
,
got_xml
,
self
.
assertEqual
(
expected_xml
,
got_xml
,
'
\
n
'
.
join
([
q
for
q
in
difflib
.
unified_diff
(
expected_xml
.
split
(
'
\
n
'
),
got_xml
.
split
(
'
\
n
'
))]))
'
\
n
'
.
join
([
q
for
q
in
difflib
.
unified_diff
(
expected_xml
.
split
(
'
\
n
'
),
got_xml
.
split
(
'
\
n
'
))]))
...
@@ -1209,6 +1227,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
...
@@ -1209,6 +1227,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
</list>
</list>
<unicode>paramé</unicode>
<unicode>paramé</unicode>
<unicode>%(param)s</unicode>
<unicode>%(param)s</unicode>
<string>root_instance_short_title</string>
<unicode/>
<string>root_instance_title</string>
<string>root_instance_title</string>
<unicode>%(root_instance_title)s</unicode>
<unicode>%(root_instance_title)s</unicode>
<string>slap_computer_id</string>
<string>slap_computer_id</string>
...
@@ -1341,6 +1361,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
...
@@ -1341,6 +1361,8 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
</list>
</list>
<unicode>paramé</unicode>
<unicode>paramé</unicode>
<unicode>%(param)s</unicode>
<unicode>%(param)s</unicode>
<string>root_instance_short_title</string>
<unicode/>
<string>root_instance_title</string>
<string>root_instance_title</string>
<unicode>%(root_instance_title)s</unicode>
<unicode>%(root_instance_title)s</unicode>
<string>slap_computer_id</string>
<string>slap_computer_id</string>
...
@@ -2423,6 +2445,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
...
@@ -2423,6 +2445,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
</list>
</list>
<unicode>paramé</unicode>
<unicode>paramé</unicode>
<unicode>%(param)s</unicode>
<unicode>%(param)s</unicode>
<string>root_instance_short_title</string>
<unicode/>
<string>root_instance_title</string>
<string>root_instance_title</string>
<unicode>%(root_instance_title)s</unicode>
<unicode>%(root_instance_title)s</unicode>
<string>slap_computer_id</string>
<string>slap_computer_id</string>
...
@@ -2555,6 +2579,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
...
@@ -2555,6 +2579,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
</list>
</list>
<unicode>paramé</unicode>
<unicode>paramé</unicode>
<unicode>%(param)s</unicode>
<unicode>%(param)s</unicode>
<string>root_instance_short_title</string>
<unicode/>
<string>root_instance_title</string>
<string>root_instance_title</string>
<unicode>%(root_instance_title)s</unicode>
<unicode>%(root_instance_title)s</unicode>
<string>slap_computer_id</string>
<string>slap_computer_id</string>
...
@@ -2812,6 +2838,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
...
@@ -2812,6 +2838,8 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
<unicode>%(ip)s</unicode>
<unicode>%(ip)s</unicode>
</tuple>
</tuple>
</list>
</list>
<string>root_instance_short_title</string>
<unicode/>
<string>root_instance_title</string>
<string>root_instance_title</string>
<unicode>%(root_instance_title)s</unicode>
<unicode>%(root_instance_title)s</unicode>
<string>slap_computer_id</string>
<string>slap_computer_id</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment