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
fec25846
Commit
fec25846
authored
Apr 29, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed tests
parent
36518458
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
slapos/cli/supervisord.py
slapos/cli/supervisord.py
+0
-1
slapos/tests/slapgrid.py
slapos/tests/slapgrid.py
+13
-12
No files found.
slapos/cli/supervisord.py
View file @
fec25846
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
import
argparse
import
logging
import
logging
import
os
import
os
...
...
slapos/tests/slapgrid.py
View file @
fec25846
...
@@ -44,6 +44,7 @@ import xml_marshaller
...
@@ -44,6 +44,7 @@ import xml_marshaller
import
slapos.slap.slap
import
slapos.slap.slap
import
slapos.grid.utils
import
slapos.grid.utils
from
slapos.grid
import
slapgrid
from
slapos.grid
import
slapgrid
from
slapos.cli_legacy.slapgrid
import
parseArgumentTupleAndReturnSlapgridObject
from
slapos.grid.utils
import
md5digest
from
slapos.grid.utils
import
md5digest
from
slapos.grid.watchdog
import
Watchdog
,
getWatchdogID
from
slapos.grid.watchdog
import
Watchdog
,
getWatchdogID
...
@@ -1580,7 +1581,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
...
@@ -1580,7 +1581,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
"""
"""
Raises if the argument list if empty and without configuration file.
Raises if the argument list if empty and without configuration file.
"""
"""
parser
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
parser
=
parseArgumentTupleAndReturnSlapgridObject
# XXX: SystemExit is too generic exception, it is only known that
# XXX: SystemExit is too generic exception, it is only known that
# something is wrong
# something is wrong
self
.
assertRaises
(
SystemExit
,
parser
,
*
())
self
.
assertRaises
(
SystemExit
,
parser
,
*
())
...
@@ -1590,7 +1591,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
...
@@ -1590,7 +1591,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
Check if we can have the slapgrid object returned with the minimum
Check if we can have the slapgrid object returned with the minimum
arguments.
arguments.
"""
"""
parser
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
parser
=
parseArgumentTupleAndReturnSlapgridObject
return_list
=
parser
(
*
self
.
default_arg_tuple
)
return_list
=
parser
(
*
self
.
default_arg_tuple
)
self
.
assertEquals
(
2
,
len
(
return_list
))
self
.
assertEquals
(
2
,
len
(
return_list
))
...
@@ -1598,7 +1599,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
...
@@ -1598,7 +1599,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
"""
"""
Raises if the signature_private_key_file does not exists.
Raises if the signature_private_key_file does not exists.
"""
"""
parser
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
parser
=
parseArgumentTupleAndReturnSlapgridObject
argument_tuple
=
(
"--signature_private_key_file"
,
"/non/exists/path"
)
+
\
argument_tuple
=
(
"--signature_private_key_file"
,
"/non/exists/path"
)
+
\
self
.
default_arg_tuple
self
.
default_arg_tuple
self
.
assertRaisesRegexp
(
RuntimeError
,
self
.
assertRaisesRegexp
(
RuntimeError
,
...
@@ -1610,7 +1611,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
...
@@ -1610,7 +1611,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
Check if the signature private key argument value is available on
Check if the signature private key argument value is available on
slapgrid object.
slapgrid object.
"""
"""
parser
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
parser
=
parseArgumentTupleAndReturnSlapgridObject
argument_tuple
=
(
"--signature_private_key_file"
,
argument_tuple
=
(
"--signature_private_key_file"
,
self
.
signature_key_file_descriptor
.
name
)
+
\
self
.
signature_key_file_descriptor
.
name
)
+
\
self
.
default_arg_tuple
self
.
default_arg_tuple
...
@@ -1622,7 +1623,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
...
@@ -1622,7 +1623,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
"""
"""
Check if giving --all triggers "develop" option.
Check if giving --all triggers "develop" option.
"""
"""
parser
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
parser
=
parseArgumentTupleAndReturnSlapgridObject
argument_tuple
=
(
"--all"
,)
+
self
.
default_arg_tuple
argument_tuple
=
(
"--all"
,)
+
self
.
default_arg_tuple
slapgrid_object
=
parser
(
*
argument_tuple
)[
0
]
slapgrid_object
=
parser
(
*
argument_tuple
)[
0
]
self
.
assertTrue
(
slapgrid_object
.
develop
)
self
.
assertTrue
(
slapgrid_object
.
develop
)
...
@@ -1632,7 +1633,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
...
@@ -1632,7 +1633,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
Check if not giving --all neither --develop triggers "develop"
Check if not giving --all neither --develop triggers "develop"
option to be False.
option to be False.
"""
"""
parser
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
parser
=
parseArgumentTupleAndReturnSlapgridObject
argument_tuple
=
self
.
default_arg_tuple
argument_tuple
=
self
.
default_arg_tuple
slapgrid_object
=
parser
(
*
argument_tuple
)[
0
]
slapgrid_object
=
parser
(
*
argument_tuple
)[
0
]
self
.
assertFalse
(
slapgrid_object
.
develop
)
self
.
assertFalse
(
slapgrid_object
.
develop
)
...
@@ -1642,7 +1643,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
...
@@ -1642,7 +1643,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
Check if not giving --maximum-periodicity triggers "force_periodicity"
Check if not giving --maximum-periodicity triggers "force_periodicity"
option to be false.
option to be false.
"""
"""
parser
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
parser
=
parseArgumentTupleAndReturnSlapgridObject
argument_tuple
=
self
.
default_arg_tuple
argument_tuple
=
self
.
default_arg_tuple
slapgrid_object
=
parser
(
*
argument_tuple
)[
0
]
slapgrid_object
=
parser
(
*
argument_tuple
)[
0
]
self
.
assertFalse
(
slapgrid_object
.
force_periodicity
)
self
.
assertFalse
(
slapgrid_object
.
force_periodicity
)
...
@@ -1651,7 +1652,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
...
@@ -1651,7 +1652,7 @@ class TestSlapgridArgumentTuple(SlapgridInitialization):
"""
"""
Check if giving --maximum-periodicity triggers "force_periodicity" option.
Check if giving --maximum-periodicity triggers "force_periodicity" option.
"""
"""
parser
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
parser
=
parseArgumentTupleAndReturnSlapgridObject
argument_tuple
=
(
"--maximum-periodicity"
,
"40"
)
+
self
.
default_arg_tuple
argument_tuple
=
(
"--maximum-periodicity"
,
"40"
)
+
self
.
default_arg_tuple
slapgrid_object
=
parser
(
*
argument_tuple
)[
0
]
slapgrid_object
=
parser
(
*
argument_tuple
)[
0
]
self
.
assertTrue
(
slapgrid_object
.
force_periodicity
)
self
.
assertTrue
(
slapgrid_object
.
force_periodicity
)
...
@@ -1675,7 +1676,7 @@ upload-to-binary-cache-url-blacklist =
...
@@ -1675,7 +1676,7 @@ upload-to-binary-cache-url-blacklist =
http://2/bla
http://2/bla
"""
%
dict
(
fake_file
=
self
.
fake_file_descriptor
.
name
))
"""
%
dict
(
fake_file
=
self
.
fake_file_descriptor
.
name
))
self
.
slapos_config_descriptor
.
seek
(
0
)
self
.
slapos_config_descriptor
.
seek
(
0
)
slapgrid_object
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
(
slapgrid_object
=
parseArgumentTupleAndReturnSlapgridObject
(
*
self
.
default_arg_tuple
)[
0
]
*
self
.
default_arg_tuple
)[
0
]
self
.
assertEqual
(
self
.
assertEqual
(
slapgrid_object
.
upload_to_binary_cache_url_blacklist
,
slapgrid_object
.
upload_to_binary_cache_url_blacklist
,
...
@@ -1703,7 +1704,7 @@ download-from-binary-cache-url-blacklist =
...
@@ -1703,7 +1704,7 @@ download-from-binary-cache-url-blacklist =
http://2/bla
http://2/bla
"""
%
dict
(
fake_file
=
self
.
fake_file_descriptor
.
name
))
"""
%
dict
(
fake_file
=
self
.
fake_file_descriptor
.
name
))
self
.
slapos_config_descriptor
.
seek
(
0
)
self
.
slapos_config_descriptor
.
seek
(
0
)
slapgrid_object
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
(
slapgrid_object
=
parseArgumentTupleAndReturnSlapgridObject
(
*
self
.
default_arg_tuple
)[
0
]
*
self
.
default_arg_tuple
)[
0
]
self
.
assertEqual
(
self
.
assertEqual
(
slapgrid_object
.
upload_to_binary_cache_url_blacklist
,
slapgrid_object
.
upload_to_binary_cache_url_blacklist
,
...
@@ -1735,7 +1736,7 @@ download-from-binary-cache-url-blacklist =
...
@@ -1735,7 +1736,7 @@ download-from-binary-cache-url-blacklist =
http://4/bla
http://4/bla
"""
%
dict
(
fake_file
=
self
.
fake_file_descriptor
.
name
))
"""
%
dict
(
fake_file
=
self
.
fake_file_descriptor
.
name
))
self
.
slapos_config_descriptor
.
seek
(
0
)
self
.
slapos_config_descriptor
.
seek
(
0
)
slapgrid_object
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
(
slapgrid_object
=
parseArgumentTupleAndReturnSlapgridObject
(
*
self
.
default_arg_tuple
)[
0
]
*
self
.
default_arg_tuple
)[
0
]
self
.
assertEqual
(
self
.
assertEqual
(
slapgrid_object
.
upload_to_binary_cache_url_blacklist
,
slapgrid_object
.
upload_to_binary_cache_url_blacklist
,
...
@@ -1764,7 +1765,7 @@ binary-cache-url-blacklist =
...
@@ -1764,7 +1765,7 @@ binary-cache-url-blacklist =
http://2/bla
http://2/bla
"""
%
dict
(
fake_file
=
self
.
fake_file_descriptor
.
name
))
"""
%
dict
(
fake_file
=
self
.
fake_file_descriptor
.
name
))
self
.
slapos_config_descriptor
.
seek
(
0
)
self
.
slapos_config_descriptor
.
seek
(
0
)
slapgrid_object
=
slapgrid
.
parseArgumentTupleAndReturnSlapgridObject
(
slapgrid_object
=
parseArgumentTupleAndReturnSlapgridObject
(
*
self
.
default_arg_tuple
)[
0
]
*
self
.
default_arg_tuple
)[
0
]
self
.
assertEqual
(
self
.
assertEqual
(
slapgrid_object
.
upload_to_binary_cache_url_blacklist
,
slapgrid_object
.
upload_to_binary_cache_url_blacklist
,
...
...
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