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
Labels
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
7386bf0c
Commit
7386bf0c
authored
Aug 08, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid one global.
parent
3b6cead7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
33 deletions
+22
-33
slapos/tests/slapformat.py
slapos/tests/slapformat.py
+22
-33
No files found.
slapos/tests/slapformat.py
View file @
7386bf0c
...
@@ -8,7 +8,6 @@ import os
...
@@ -8,7 +8,6 @@ import os
import
pwd
import
pwd
USER_LIST
=
[]
USER_LIST
=
[]
EXTERNAL_COMMAND_LIST
=
[]
class
FakeConfig
:
class
FakeConfig
:
pass
pass
...
@@ -21,12 +20,15 @@ class TestLoggerHandler(logging.Handler):
...
@@ -21,12 +20,15 @@ class TestLoggerHandler(logging.Handler):
def
emit
(
self
,
record
):
def
emit
(
self
,
record
):
self
.
bucket
.
append
(
record
.
msg
)
self
.
bucket
.
append
(
record
.
msg
)
def
fakeCallAndRead
(
argument_list
,
raise_on_error
=
True
):
class
FakeCallAndRead
:
def
__init__
(
self
):
self
.
external_command_list
=
[]
def
__call__
(
self
,
argument_list
,
raise_on_error
=
True
):
if
'useradd'
in
argument_list
:
if
'useradd'
in
argument_list
:
global
USER_LIST
global
USER_LIST
USER_LIST
.
append
(
argument_list
[
-
1
])
USER_LIST
.
append
(
argument_list
[
-
1
])
global
EXTERNAL_COMMAND_LIST
self
.
external_command_list
.
append
(
argument_list
)
EXTERNAL_COMMAND_LIST
.
append
(
argument_list
)
return
0
,
'UP'
return
0
,
'UP'
class
LoggableWrapper
:
class
LoggableWrapper
:
...
@@ -108,13 +110,12 @@ class SlapformatMixin(unittest.TestCase):
...
@@ -108,13 +110,12 @@ class SlapformatMixin(unittest.TestCase):
config
.
logger
=
logger
config
.
logger
=
logger
self
.
partition
=
slapos
.
format
.
Partition
(
'partition'
,
'/part_path'
,
self
.
partition
=
slapos
.
format
.
Partition
(
'partition'
,
'/part_path'
,
slapos
.
format
.
User
(
'testuser'
),
[],
None
)
slapos
.
format
.
User
(
'testuser'
),
[],
None
)
global
EXTERNAL_COMMAND_LIST
global
USER_LIST
global
USER_LIST
EXTERNAL_COMMAND_LIST
=
[]
USER_LIST
=
[
'testuser'
]
USER_LIST
=
[
'testuser'
]
self
.
real_callAndRead
=
slapos
.
format
.
callAndRead
self
.
real_callAndRead
=
slapos
.
format
.
callAndRead
slapos
.
format
.
callAndRead
=
fakeCallAndRead
self
.
fakeCallAndRead
=
FakeCallAndRead
()
slapos
.
format
.
callAndRead
=
self
.
fakeCallAndRead
self
.
patchOs
(
logger
)
self
.
patchOs
(
logger
)
self
.
patchGrp
()
self
.
patchGrp
()
self
.
patchPwd
()
self
.
patchPwd
()
...
@@ -123,9 +124,7 @@ class SlapformatMixin(unittest.TestCase):
...
@@ -123,9 +124,7 @@ class SlapformatMixin(unittest.TestCase):
self
.
restoreOs
()
self
.
restoreOs
()
self
.
restoreGrp
()
self
.
restoreGrp
()
self
.
restorePwd
()
self
.
restorePwd
()
global
EXTERNAL_COMMAND_LIST
global
USER_LIST
global
USER_LIST
EXTERNAL_COMMAND_LIST
=
[]
USER_LIST
=
[
'testuser'
]
USER_LIST
=
[
'testuser'
]
slapos
.
format
.
callAndRead
=
self
.
real_callAndRead
slapos
.
format
.
callAndRead
=
self
.
real_callAndRead
...
@@ -151,13 +150,12 @@ class TestComputer(SlapformatMixin):
...
@@ -151,13 +150,12 @@ class TestComputer(SlapformatMixin):
"chown('/software_root', 0, 0)"
,
"chown('/software_root', 0, 0)"
,
"chmod('/software_root', 493)"
],
"chmod('/software_root', 493)"
],
self
.
test_result
.
bucket
)
self
.
test_result
.
bucket
)
global
EXTERNAL_COMMAND_LIST
self
.
assertEqual
([
self
.
assertEqual
([
[
'ip'
,
'addr'
,
'list'
,
'bridge'
],
[
'ip'
,
'addr'
,
'list'
,
'bridge'
],
[
'groupadd'
,
'slapsoft'
],
[
'groupadd'
,
'slapsoft'
],
[
'useradd'
,
'-d'
,
'/software_root'
,
'-g'
,
'slapsoft'
,
'-s'
,
[
'useradd'
,
'-d'
,
'/software_root'
,
'-g'
,
'slapsoft'
,
'-s'
,
'/bin/false'
,
'slapsoft'
]],
'/bin/false'
,
'slapsoft'
]],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
def
test_construct_empty_prepared_no_alter_user
(
self
):
def
test_construct_empty_prepared_no_alter_user
(
self
):
computer
=
slapos
.
format
.
Computer
(
'computer'
,
computer
=
slapos
.
format
.
Computer
(
'computer'
,
...
@@ -170,10 +168,9 @@ class TestComputer(SlapformatMixin):
...
@@ -170,10 +168,9 @@ class TestComputer(SlapformatMixin):
"makedirs('/software_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
],
"chmod('/software_root', 493)"
],
self
.
test_result
.
bucket
)
self
.
test_result
.
bucket
)
global
EXTERNAL_COMMAND_LIST
self
.
assertEqual
([
self
.
assertEqual
([
[
'ip'
,
'addr'
,
'list'
,
'bridge'
],],
[
'ip'
,
'addr'
,
'list'
,
'bridge'
],],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
def
test_construct_empty_prepared_no_alter_network
(
self
):
def
test_construct_empty_prepared_no_alter_network
(
self
):
computer
=
slapos
.
format
.
Computer
(
'computer'
,
computer
=
slapos
.
format
.
Computer
(
'computer'
,
...
@@ -187,13 +184,12 @@ class TestComputer(SlapformatMixin):
...
@@ -187,13 +184,12 @@ class TestComputer(SlapformatMixin):
"chown('/software_root', 0, 0)"
,
"chown('/software_root', 0, 0)"
,
"chmod('/software_root', 493)"
],
"chmod('/software_root', 493)"
],
self
.
test_result
.
bucket
)
self
.
test_result
.
bucket
)
global
EXTERNAL_COMMAND_LIST
self
.
assertEqual
([
self
.
assertEqual
([
[
'ip'
,
'addr'
,
'list'
,
'bridge'
],
[
'ip'
,
'addr'
,
'list'
,
'bridge'
],
[
'groupadd'
,
'slapsoft'
],
[
'groupadd'
,
'slapsoft'
],
[
'useradd'
,
'-d'
,
'/software_root'
,
'-g'
,
'slapsoft'
,
'-s'
,
[
'useradd'
,
'-d'
,
'/software_root'
,
'-g'
,
'slapsoft'
,
'-s'
,
'/bin/false'
,
'slapsoft'
]],
'/bin/false'
,
'slapsoft'
]],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
def
test_construct_empty_prepared_no_alter_network_user
(
self
):
def
test_construct_empty_prepared_no_alter_network_user
(
self
):
computer
=
slapos
.
format
.
Computer
(
'computer'
,
computer
=
slapos
.
format
.
Computer
(
'computer'
,
...
@@ -206,11 +202,10 @@ class TestComputer(SlapformatMixin):
...
@@ -206,11 +202,10 @@ class TestComputer(SlapformatMixin):
"makedirs('/software_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
],
"chmod('/software_root', 493)"
],
self
.
test_result
.
bucket
)
self
.
test_result
.
bucket
)
global
EXTERNAL_COMMAND_LIST
self
.
assertEqual
([
self
.
assertEqual
([
[
'ip'
,
'addr'
,
'list'
,
'bridge'
],
[
'ip'
,
'addr'
,
'list'
,
'bridge'
],
],
],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
class
TestPartition
(
SlapformatMixin
):
class
TestPartition
(
SlapformatMixin
):
...
@@ -237,7 +232,6 @@ class TestPartition(SlapformatMixin):
...
@@ -237,7 +232,6 @@ class TestPartition(SlapformatMixin):
class
TestUser
(
SlapformatMixin
):
class
TestUser
(
SlapformatMixin
):
def
test_create
(
self
):
def
test_create
(
self
):
global
EXTERNAL_COMMAND_LIST
user
=
slapos
.
format
.
User
(
'doesnotexistsyet'
)
user
=
slapos
.
format
.
User
(
'doesnotexistsyet'
)
user
.
setPath
(
'/doesnotexistsyet'
)
user
.
setPath
(
'/doesnotexistsyet'
)
user
.
create
()
user
.
create
()
...
@@ -248,10 +242,9 @@ class TestUser(SlapformatMixin):
...
@@ -248,10 +242,9 @@ class TestUser(SlapformatMixin):
[
'useradd'
,
'-d'
,
'/doesnotexistsyet'
,
'-g'
,
'doesnotexistsyet'
,
'-s'
,
[
'useradd'
,
'-d'
,
'/doesnotexistsyet'
,
'-g'
,
'doesnotexistsyet'
,
'-s'
,
'/bin/false'
,
'doesnotexistsyet'
]
'/bin/false'
,
'doesnotexistsyet'
]
],
],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
def
test_create_additional_groups
(
self
):
def
test_create_additional_groups
(
self
):
global
EXTERNAL_COMMAND_LIST
user
=
slapos
.
format
.
User
(
'doesnotexistsyet'
,
[
'additionalgroup1'
,
user
=
slapos
.
format
.
User
(
'doesnotexistsyet'
,
[
'additionalgroup1'
,
'additionalgroup2'
])
'additionalgroup2'
])
user
.
setPath
(
'/doesnotexistsyet'
)
user
.
setPath
(
'/doesnotexistsyet'
)
...
@@ -264,11 +257,10 @@ class TestUser(SlapformatMixin):
...
@@ -264,11 +257,10 @@ class TestUser(SlapformatMixin):
'/bin/false'
,
'-G'
,
'additionalgroup1,additionalgroup2'
,
'/bin/false'
,
'-G'
,
'additionalgroup1,additionalgroup2'
,
'doesnotexistsyet'
]
'doesnotexistsyet'
]
],
],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
def
test_create_group_exists
(
self
):
def
test_create_group_exists
(
self
):
pwd
.
getpwnam
=
self
.
raisingKeyError
pwd
.
getpwnam
=
self
.
raisingKeyError
global
EXTERNAL_COMMAND_LIST
user
=
slapos
.
format
.
User
(
'testuser'
)
user
=
slapos
.
format
.
User
(
'testuser'
)
user
.
setPath
(
'/testuser'
)
user
.
setPath
(
'/testuser'
)
...
@@ -279,11 +271,10 @@ class TestUser(SlapformatMixin):
...
@@ -279,11 +271,10 @@ class TestUser(SlapformatMixin):
[
'useradd'
,
'-d'
,
'/testuser'
,
'-g'
,
'testuser'
,
'-s'
,
'/bin/false'
,
[
'useradd'
,
'-d'
,
'/testuser'
,
'-g'
,
'testuser'
,
'-s'
,
'/bin/false'
,
'testuser'
]
'testuser'
]
],
],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
def
test_create_user_exists_additional_groups
(
self
):
def
test_create_user_exists_additional_groups
(
self
):
grp
.
getgrnam
=
self
.
raisingKeyError
grp
.
getgrnam
=
self
.
raisingKeyError
global
EXTERNAL_COMMAND_LIST
user
=
slapos
.
format
.
User
(
'testuser'
,
[
'additionalgroup1'
,
user
=
slapos
.
format
.
User
(
'testuser'
,
[
'additionalgroup1'
,
'additionalgroup2'
])
'additionalgroup2'
])
user
.
setPath
(
'/testuser'
)
user
.
setPath
(
'/testuser'
)
...
@@ -295,11 +286,10 @@ class TestUser(SlapformatMixin):
...
@@ -295,11 +286,10 @@ class TestUser(SlapformatMixin):
[
'usermod'
,
'-d'
,
'/testuser'
,
'-g'
,
'testuser'
,
'-s'
,
'/bin/false'
,
[
'usermod'
,
'-d'
,
'/testuser'
,
'-g'
,
'testuser'
,
'-s'
,
'/bin/false'
,
'-G'
,
'additionalgroup1,additionalgroup2'
,
'testuser'
]
'-G'
,
'additionalgroup1,additionalgroup2'
,
'testuser'
]
],
],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
def
test_create_user_exists
(
self
):
def
test_create_user_exists
(
self
):
grp
.
getgrnam
=
self
.
raisingKeyError
grp
.
getgrnam
=
self
.
raisingKeyError
global
EXTERNAL_COMMAND_LIST
user
=
slapos
.
format
.
User
(
'testuser'
)
user
=
slapos
.
format
.
User
(
'testuser'
)
user
.
setPath
(
'/testuser'
)
user
.
setPath
(
'/testuser'
)
user
.
create
()
user
.
create
()
...
@@ -310,10 +300,9 @@ class TestUser(SlapformatMixin):
...
@@ -310,10 +300,9 @@ class TestUser(SlapformatMixin):
[
'usermod'
,
'-d'
,
'/testuser'
,
'-g'
,
'testuser'
,
'-s'
,
'/bin/false'
,
[
'usermod'
,
'-d'
,
'/testuser'
,
'-g'
,
'testuser'
,
'-s'
,
'/bin/false'
,
'testuser'
]
'testuser'
]
],
],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
def
test_create_user_group_exists
(
self
):
def
test_create_user_group_exists
(
self
):
global
EXTERNAL_COMMAND_LIST
user
=
slapos
.
format
.
User
(
'testuser'
)
user
=
slapos
.
format
.
User
(
'testuser'
)
user
.
setPath
(
'/testuser'
)
user
.
setPath
(
'/testuser'
)
user
.
create
()
user
.
create
()
...
@@ -323,7 +312,7 @@ class TestUser(SlapformatMixin):
...
@@ -323,7 +312,7 @@ class TestUser(SlapformatMixin):
[
'usermod'
,
'-d'
,
'/testuser'
,
'-g'
,
'testuser'
,
'-s'
,
'/bin/false'
,
[
'usermod'
,
'-d'
,
'/testuser'
,
'-g'
,
'testuser'
,
'-s'
,
'/bin/false'
,
'testuser'
]
'testuser'
]
],
],
EXTERNAL_COMMAND_LIST
)
self
.
fakeCallAndRead
.
external_command_list
)
def
test_isAvailable
(
self
):
def
test_isAvailable
(
self
):
user
=
slapos
.
format
.
User
(
'testuser'
)
user
=
slapos
.
format
.
User
(
'testuser'
)
...
...
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