Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Steven Gueguen
slapos
Commits
f986e3ba
Commit
f986e3ba
authored
Mar 26, 2019
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
proftpd/test: use slapos.testing
parent
cebd5a58
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
58 additions
and
374 deletions
+58
-374
software/proftpd/test/setup.py
software/proftpd/test/setup.py
+17
-17
software/proftpd/test/test.py
software/proftpd/test/test.py
+41
-35
software/proftpd/test/utils.py
software/proftpd/test/utils.py
+0
-322
No files found.
software/proftpd/test/setup.py
View file @
f986e3ba
...
@@ -25,14 +25,14 @@
...
@@ -25,14 +25,14 @@
#
#
##############################################################################
##############################################################################
from
setuptools
import
setup
,
find_packages
from
setuptools
import
setup
,
find_packages
import
glob
import
os
version
=
'0.0.1.dev0'
version
=
'0.0.1.dev0'
name
=
'slapos.test.proftpd'
name
=
'slapos.test.proftpd'
long_description
=
open
(
"README.md"
).
read
()
with
open
(
"README.md"
)
as
f
:
long_description
=
f
.
read
()
setup
(
name
=
name
,
setup
(
name
=
name
,
version
=
version
,
version
=
version
,
description
=
"Test for SlapOS' ProFTPd"
,
description
=
"Test for SlapOS' ProFTPd"
,
long_description
=
long_description
,
long_description
=
long_description
,
...
@@ -51,4 +51,4 @@ setup(name=name,
...
@@ -51,4 +51,4 @@ setup(name=name,
],
],
zip_safe
=
True
,
zip_safe
=
True
,
test_suite
=
'test'
,
test_suite
=
'test'
,
)
)
software/proftpd/test/test.py
View file @
f986e3ba
...
@@ -37,22 +37,15 @@ import psutil
...
@@ -37,22 +37,15 @@ import psutil
from
paramiko.ssh_exception
import
SSHException
from
paramiko.ssh_exception
import
SSHException
from
paramiko.ssh_exception
import
AuthenticationException
from
paramiko.ssh_exception
import
AuthenticationException
import
utils
from
slapos.testing.testcase
import
makeModuleSetUpAndTestCaseClass
from
slapos.testing.utils
import
findFreeTCPPort
setUpModule
,
SlapOSInstanceTestCase
=
makeModuleSetUpAndTestCaseClass
(
os
.
path
.
abspath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'..'
,
'software.cfg'
)))
# for development: debugging logs and install Ctrl+C handler
if
os
.
environ
.
get
(
'SLAPOS_TEST_DEBUG'
):
import
logging
logging
.
basicConfig
(
level
=
logging
.
DEBUG
)
import
unittest
unittest
.
installHandler
()
class
ProFTPdTestCase
(
utils
.
SlapOSInstanceTestCase
):
@
classmethod
def
getSoftwareURLList
(
cls
):
return
(
os
.
path
.
abspath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'..'
,
'software.cfg'
)),
)
class
ProFTPdTestCase
(
SlapOSInstanceTestCase
):
def
_getConnection
(
self
,
username
=
None
,
password
=
None
,
hostname
=
None
):
def
_getConnection
(
self
,
username
=
None
,
password
=
None
,
hostname
=
None
):
"""Returns a pysftp connection connected to the SFTP
"""Returns a pysftp connection connected to the SFTP
...
@@ -77,7 +70,7 @@ class ProFTPdTestCase(utils.SlapOSInstanceTestCase):
...
@@ -77,7 +70,7 @@ class ProFTPdTestCase(utils.SlapOSInstanceTestCase):
class
TestSFTPListen
(
ProFTPdTestCase
):
class
TestSFTPListen
(
ProFTPdTestCase
):
def
test_listen_on_ipv4
(
self
):
def
test_listen_on_ipv4
(
self
):
self
.
assertTrue
(
self
.
_getConnection
(
hostname
=
self
.
config
[
'ipv4_address'
]
))
self
.
assertTrue
(
self
.
_getConnection
(
hostname
=
self
.
_ipv4_address
))
def
test_does_not_listen_on_all_ip
(
self
):
def
test_does_not_listen_on_all_ip
(
self
):
with
self
.
assertRaises
(
SSHException
):
with
self
.
assertRaises
(
SSHException
):
...
@@ -115,20 +108,22 @@ class TestSFTPOperations(ProFTPdTestCase):
...
@@ -115,20 +108,22 @@ class TestSFTPOperations(ProFTPdTestCase):
# download the file again, it should have same content
# download the file again, it should have same content
tempdir
=
tempfile
.
mkdtemp
()
tempdir
=
tempfile
.
mkdtemp
()
self
.
addCleanup
(
lambda
:
shutil
.
rmtree
(
tempdir
))
self
.
addCleanup
(
lambda
:
shutil
.
rmtree
(
tempdir
))
local_file
=
os
.
path
.
join
(
tempdir
,
'testfile'
)
local_file
=
os
.
path
.
join
(
tempdir
,
'testfile'
)
retrieve_same_file
=
sftp
.
get
(
'testfile'
,
local_file
)
sftp
.
get
(
'testfile'
,
local_file
)
with
open
(
local_file
)
as
f
:
with
open
(
local_file
)
as
f
:
self
.
assertEqual
(
f
.
read
(),
"Hello FTP !"
)
self
.
assertEqual
(
f
.
read
(),
"Hello FTP !"
)
def
test_uploaded_file_not_visible_until_fully_uploaded
(
self
):
def
test_uploaded_file_not_visible_until_fully_uploaded
(
self
):
test_self
=
self
test_self
=
self
class
PartialFile
(
StringIO
.
StringIO
):
class
PartialFile
(
StringIO
.
StringIO
):
def
read
(
self
,
*
args
):
def
read
(
self
,
*
args
):
# file is not visible yet
# file is not visible yet
test_self
.
assertNotIn
(
'destination'
,
os
.
listdir
(
test_self
.
upload_dir
))
test_self
.
assertNotIn
(
'destination'
,
os
.
listdir
(
test_self
.
upload_dir
))
# it's just a hidden file
# it's just a hidden file
test_self
.
assertEqual
([
'.in.destination.'
],
os
.
listdir
(
test_self
.
upload_dir
))
test_self
.
assertEqual
(
[
'.in.destination.'
],
os
.
listdir
(
test_self
.
upload_dir
))
return
StringIO
.
StringIO
.
read
(
self
,
*
args
)
return
StringIO
.
StringIO
.
read
(
self
,
*
args
)
with
self
.
_getConnection
()
as
sftp
:
with
self
.
_getConnection
()
as
sftp
:
...
@@ -140,13 +135,16 @@ class TestSFTPOperations(ProFTPdTestCase):
...
@@ -140,13 +135,16 @@ class TestSFTPOperations(ProFTPdTestCase):
def
test_partial_upload_are_deleted
(
self
):
def
test_partial_upload_are_deleted
(
self
):
test_self
=
self
test_self
=
self
with
self
.
_getConnection
()
as
sftp
:
with
self
.
_getConnection
()
as
sftp
:
class
ErrorFile
(
StringIO
.
StringIO
):
class
ErrorFile
(
StringIO
.
StringIO
):
def
read
(
self
,
*
args
):
def
read
(
self
,
*
args
):
# at this point, file is already created on server
# at this point, file is already created on server
test_self
.
assertEqual
([
'.in.destination.'
],
os
.
listdir
(
test_self
.
upload_dir
))
test_self
.
assertEqual
(
[
'.in.destination.'
],
os
.
listdir
(
test_self
.
upload_dir
))
# simulate a connection closed
# simulate a connection closed
sftp
.
sftp_client
.
close
()
sftp
.
sftp_client
.
close
()
return
"something that will not be sent to server"
return
"something that will not be sent to server"
with
self
.
assertRaises
(
IOError
):
with
self
.
assertRaises
(
IOError
):
sftp
.
sftp_client
.
putfo
(
ErrorFile
(),
"destination"
)
sftp
.
sftp_client
.
putfo
(
ErrorFile
(),
"destination"
)
# no half uploaded file is kept
# no half uploaded file is kept
...
@@ -164,11 +162,13 @@ class TestSFTPOperations(ProFTPdTestCase):
...
@@ -164,11 +162,13 @@ class TestSFTPOperations(ProFTPdTestCase):
class
TestUserManagement
(
ProFTPdTestCase
):
class
TestUserManagement
(
ProFTPdTestCase
):
def
test_user_can_be_added_from_script
(
self
):
def
test_user_can_be_added_from_script
(
self
):
with
self
.
assertRaisesRegexp
(
AuthenticationException
,
'Authentication failed'
):
with
self
.
assertRaisesRegexp
(
AuthenticationException
,
'Authentication failed'
):
self
.
_getConnection
(
username
=
'bob'
,
password
=
'secret'
)
self
.
_getConnection
(
username
=
'bob'
,
password
=
'secret'
)
subprocess
.
check_call
(
subprocess
.
check_call
(
'echo secret | %s/bin/ftpasswd --name=bob --stdin'
%
self
.
computer_partition_root_path
,
'echo secret | %s/bin/ftpasswd --name=bob --stdin'
%
self
.
computer_partition_root_path
,
shell
=
True
)
shell
=
True
)
self
.
assertTrue
(
self
.
_getConnection
(
username
=
'bob'
,
password
=
'secret'
))
self
.
assertTrue
(
self
.
_getConnection
(
username
=
'bob'
,
password
=
'secret'
))
...
@@ -177,7 +177,8 @@ class TestBan(ProFTPdTestCase):
...
@@ -177,7 +177,8 @@ class TestBan(ProFTPdTestCase):
def
test_client_are_banned_after_5_wrong_passwords
(
self
):
def
test_client_are_banned_after_5_wrong_passwords
(
self
):
# Simulate failed 5 login attempts
# Simulate failed 5 login attempts
for
i
in
range
(
5
):
for
i
in
range
(
5
):
with
self
.
assertRaisesRegexp
(
AuthenticationException
,
'Authentication failed'
):
with
self
.
assertRaisesRegexp
(
AuthenticationException
,
'Authentication failed'
):
self
.
_getConnection
(
password
=
'wrong'
)
self
.
_getConnection
(
password
=
'wrong'
)
# after that, even with a valid password we cannot connect
# after that, even with a valid password we cannot connect
...
@@ -185,8 +186,10 @@ class TestBan(ProFTPdTestCase):
...
@@ -185,8 +186,10 @@ class TestBan(ProFTPdTestCase):
self
.
_getConnection
()
self
.
_getConnection
()
# ban event is logged
# ban event is logged
with
open
(
os
.
path
.
join
(
with
open
(
os
.
path
.
join
(
self
.
computer_partition_root_path
,
self
.
computer_partition_root_path
,
'var'
,
'log'
,
'proftpd-ban.log'
))
as
ban_log_file
:
'var'
,
'log'
,
'proftpd-ban.log'
))
as
ban_log_file
:
self
.
assertRegexpMatches
(
self
.
assertRegexpMatches
(
ban_log_file
.
readlines
()[
-
1
],
ban_log_file
.
readlines
()[
-
1
],
'login from host .* denied due to host ban'
)
'login from host .* denied due to host ban'
)
...
@@ -195,7 +198,7 @@ class TestBan(ProFTPdTestCase):
...
@@ -195,7 +198,7 @@ class TestBan(ProFTPdTestCase):
class
TestInstanceParameterPort
(
ProFTPdTestCase
):
class
TestInstanceParameterPort
(
ProFTPdTestCase
):
@
classmethod
@
classmethod
def
getInstanceParameterDict
(
cls
):
def
getInstanceParameterDict
(
cls
):
cls
.
free_port
=
utils
.
findFreeTCPPort
(
cls
.
config
[
'ipv4_address'
]
)
cls
.
free_port
=
findFreeTCPPort
(
cls
.
_ipv4_address
)
return
{
'port'
:
cls
.
free_port
}
return
{
'port'
:
cls
.
free_port
}
def
test_instance_parameter_port
(
self
):
def
test_instance_parameter_port
(
self
):
...
@@ -211,7 +214,8 @@ class TestFilesAndSocketsInInstanceDir(ProFTPdTestCase):
...
@@ -211,7 +214,8 @@ class TestFilesAndSocketsInInstanceDir(ProFTPdTestCase):
def
setUp
(
self
):
def
setUp
(
self
):
"""sets `self.proftpdProcess` to `psutil.Process` for the running proftpd in the instance.
"""sets `self.proftpdProcess` to `psutil.Process` for the running proftpd in the instance.
"""
"""
all_process_info
=
self
.
getSupervisorRPCServer
().
supervisor
.
getAllProcessInfo
()
with
self
.
slap
.
instance_supervisor_rpc
as
supervisor
:
all_process_info
=
supervisor
.
getAllProcessInfo
()
# there is only one process in this instance
# there is only one process in this instance
process_info
,
=
[
p
for
p
in
all_process_info
if
p
[
'name'
]
!=
'watchdog'
]
process_info
,
=
[
p
for
p
in
all_process_info
if
p
[
'name'
]
!=
'watchdog'
]
process
=
psutil
.
Process
(
process_info
[
'pid'
])
process
=
psutil
.
Process
(
process_info
[
'pid'
])
...
@@ -221,13 +225,15 @@ class TestFilesAndSocketsInInstanceDir(ProFTPdTestCase):
...
@@ -221,13 +225,15 @@ class TestFilesAndSocketsInInstanceDir(ProFTPdTestCase):
def
test_only_write_file_in_instance_dir
(
self
):
def
test_only_write_file_in_instance_dir
(
self
):
self
.
assertEqual
(
self
.
assertEqual
(
[],
[],
[
f
for
f
in
self
.
proftpdProcess
.
open_files
()
[
if
f
.
mode
!=
'r'
f
for
f
in
self
.
proftpdProcess
.
open_files
()
if
f
.
mode
!=
'r'
if
not
f
.
path
.
startswith
(
self
.
computer_partition_root_path
)])
if
not
f
.
path
.
startswith
(
self
.
computer_partition_root_path
)
])
def
test_only_unix_socket_in_instance_dir
(
self
):
def
test_only_unix_socket_in_instance_dir
(
self
):
self
.
assertEqual
(
self
.
assertEqual
(
[],
[],
[
s
for
s
in
self
.
proftpdProcess
.
connections
(
'unix'
)
[
if
not
s
.
laddr
.
startswith
(
self
.
computer_partition_root_path
)])
s
for
s
in
self
.
proftpdProcess
.
connections
(
'unix'
)
if
not
s
.
laddr
.
startswith
(
self
.
computer_partition_root_path
)
])
software/proftpd/test/utils.py
deleted
100644 → 0
View file @
cebd5a58
This diff is collapsed.
Click to expand it.
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