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
Boxiang Sun
slapos.core
Commits
8016bb1c
Commit
8016bb1c
authored
May 03, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken test introduced in
30a3eec6
.
parent
fe9cd9ed
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
slapos/tests/slapformat.py
slapos/tests/slapformat.py
+4
-3
No files found.
slapos/tests/slapformat.py
View file @
8016bb1c
...
@@ -83,7 +83,8 @@ class FakeCallAndRead:
...
@@ -83,7 +83,8 @@ class FakeCallAndRead:
INTERFACE_DICT
[
interface
][
socket
.
AF_INET6
].
append
({
'addr'
:
ip
,
'netmask'
:
netmask
})
INTERFACE_DICT
[
interface
][
socket
.
AF_INET6
].
append
({
'addr'
:
ip
,
'netmask'
:
netmask
})
# stabilise by mangling ip to just ip string
# stabilise by mangling ip to just ip string
argument_list
[
3
]
=
'ip/%s'
%
netmask
argument_list
[
3
]
=
'ip/%s'
%
netmask
elif
argument_list
[:
3
]
==
[
'ip'
,
'addr'
,
'list'
]:
elif
argument_list
[:
3
]
==
[
'ip'
,
'addr'
,
'list'
]
or
\
argument_list
[:
4
]
==
[
'ip'
,
'-6'
,
'addr'
,
'list'
]:
retval
=
0
,
str
(
INTERFACE_DICT
)
retval
=
0
,
str
(
INTERFACE_DICT
)
self
.
external_command_list
.
append
(
' '
.
join
(
argument_list
))
self
.
external_command_list
.
append
(
' '
.
join
(
argument_list
))
return
retval
return
retval
...
@@ -392,7 +393,7 @@ class TestComputer(SlapformatMixin):
...
@@ -392,7 +393,7 @@ class TestComputer(SlapformatMixin):
'ip addr add ip/255.255.255.255 dev bridge'
,
'ip addr add ip/255.255.255.255 dev bridge'
,
# 'ip addr list bridge',
# 'ip addr list bridge',
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge'
,
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge'
,
'ip addr list bridge'
,
'ip
-6
addr list bridge'
,
],
],
self
.
fakeCallAndRead
.
external_command_list
)
self
.
fakeCallAndRead
.
external_command_list
)
...
@@ -467,7 +468,7 @@ class TestComputer(SlapformatMixin):
...
@@ -467,7 +468,7 @@ class TestComputer(SlapformatMixin):
'ip addr add ip/255.255.255.255 dev bridge'
,
'ip addr add ip/255.255.255.255 dev bridge'
,
# 'ip addr list bridge',
# 'ip addr list bridge',
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge'
,
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge'
,
'ip addr list bridge'
,
'ip
-6
addr list bridge'
,
],
],
self
.
fakeCallAndRead
.
external_command_list
)
self
.
fakeCallAndRead
.
external_command_list
)
...
...
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