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
Xiaowu Zhang
slapos.core
Commits
da1186d4
Commit
da1186d4
authored
Nov 18, 2011
by
Yingjie Xu
Committed by
Łukasz Nowak
Dec 13, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove trailing whitespaces.
parent
ab2bd41e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
master/product/Vifib/tests/testVifibSlapWebService.py
master/product/Vifib/tests/testVifibSlapWebService.py
+7
-7
No files found.
master/product/Vifib/tests/testVifibSlapWebService.py
View file @
da1186d4
...
@@ -1103,7 +1103,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -1103,7 +1103,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
LoginDefaultUser
LoginDefaultUser
SetChildrenBComputerPartition
SetChildrenBComputerPartition
Logout
Logout
"""
"""
computer_with_software_release
=
"""
computer_with_software_release
=
"""
CustomerRegisterNewComputer
CustomerRegisterNewComputer
...
@@ -1412,7 +1412,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -1412,7 +1412,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
if
uri
!=
software_release_uri
:
if
uri
!=
software_release_uri
:
sequence
.
edit
(
software_release_uri
=
uri
)
sequence
.
edit
(
software_release_uri
=
uri
)
break
break
self
.
assertNotEquals
(
sequence
[
"software_release_uri"
],
self
.
assertNotEquals
(
sequence
[
"software_release_uri"
],
old_software_release_uri
)
old_software_release_uri
)
def
stepStoreSoftwareReleaseUri
(
self
,
sequence
,
**
kw
):
def
stepStoreSoftwareReleaseUri
(
self
,
sequence
,
**
kw
):
...
@@ -1705,14 +1705,14 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -1705,14 +1705,14 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
sequence
[
'computer_reference'
],
sequence
[
'computer_reference'
],
sequence
[
'computer_partition_reference'
])
sequence
[
'computer_partition_reference'
])
self
.
assertRaises
(
slap
.
NotFoundError
,
self
.
assertRaises
(
slap
.
NotFoundError
,
slap_computer_partition
.
request
,
slap_computer_partition
.
request
,
software_release
=
software_release_uri
,
software_release
=
software_release_uri
,
software_type
=
sequence
.
get
(
'requested_software_type'
,
software_type
=
sequence
.
get
(
'requested_software_type'
,
'requested_software_type'
),
'requested_software_type'
),
partition_reference
=
requested_reference
,
partition_reference
=
requested_reference
,
partition_parameter_kw
=
requested_parameter_dict
,
partition_parameter_kw
=
requested_parameter_dict
,
shared
=
True
,
shared
=
True
,
filter_kw
=
sequence
.
get
(
'requested_filter_dict'
,
{}),
filter_kw
=
sequence
.
get
(
'requested_filter_dict'
,
{}),
state
=
sequence
.
get
(
'instance_state'
))
state
=
sequence
.
get
(
'instance_state'
))
...
@@ -3080,7 +3080,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -3080,7 +3080,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
'slap_computer_id'
:
computer_guid
,
'slap_computer_id'
:
computer_guid
,
'slap_computer_partition_id'
:
partition_id
,
'slap_computer_partition_id'
:
partition_id
,
'slap_software_release_url'
:
software_release_uri
,
'slap_software_release_url'
:
software_release_uri
,
'slap_software_type'
:
'slap_software_type'
:
sequence
.
get
(
'requested_software_type'
,
sequence
.
get
(
'requested_software_type'
,
'requested_software_type'
),
'requested_software_type'
),
'slave_instance_list'
:
[],
'slave_instance_list'
:
[],
...
@@ -3180,7 +3180,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -3180,7 +3180,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
'slap_computer_id'
:
computer_guid
,
'slap_computer_id'
:
computer_guid
,
'slap_computer_partition_id'
:
partition_id
,
'slap_computer_partition_id'
:
partition_id
,
'slap_software_release_url'
:
software_release_uri
,
'slap_software_release_url'
:
software_release_uri
,
'slap_software_type'
:
'slap_software_type'
:
sequence
.
get
(
'requested_software_type'
,
sequence
.
get
(
'requested_software_type'
,
'requested_software_type'
),
'requested_software_type'
),
'test_parameter'
:
'lala'
,
'test_parameter'
:
'lala'
,
...
@@ -3681,7 +3681,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -3681,7 +3681,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
slave_instance
[
"slap_software_type"
])
slave_instance
[
"slap_software_type"
])
def
stepCheckTwoSlaveInstanceListFromOneComputerPartition
(
self
,
sequence
):
def
stepCheckTwoSlaveInstanceListFromOneComputerPartition
(
self
,
sequence
):
self
.
stepCheckSlaveInstanceListFromOneComputerPartition
(
sequence
,
self
.
stepCheckSlaveInstanceListFromOneComputerPartition
(
sequence
,
expected_amount
=
2
)
expected_amount
=
2
)
def
stepCheckSlaveInstanceAccessUsingCurrentSoftwareInstanceUser
(
self
,
sequence
):
def
stepCheckSlaveInstanceAccessUsingCurrentSoftwareInstanceUser
(
self
,
sequence
):
...
...
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