Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
diffoscope
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reproducible Builds
diffoscope
Commits
490a4b4c
Commit
490a4b4c
authored
3 years ago
by
Brent Spillner
Committed by
Chris Lamb
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added unit tests for the socket/pipe module.
parent
9b249095
No related branches found
No related tags found
1 merge request
!94
Add graceful handling for UNIX sockets and named pipes (cf. issue #293)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/comparators/test_sockets.py
+93
-0
93 additions, 0 deletions
tests/comparators/test_sockets.py
with
93 additions
and
0 deletions
tests/comparators/test_sockets.py
0 → 100644
+
93
−
0
View file @
490a4b4c
#
# diffoscope: in-depth comparison of files, archives, and directories
#
# Copyright © 2017, 2020 Chris Lamb <lamby@debian.org>
# Copyright © 2021 Brent Spillner <s p i l l n e r @ a c m . o r g>
#
# diffoscope is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# diffoscope is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
import
os
import
socket
import
pytest
from
diffoscope.comparators.binary
import
FilesystemFile
from
diffoscope.comparators.socket_or_fifo
import
SocketOrFIFO
,
format_socket
from
diffoscope.comparators.utils.specialize
import
specialize
from
..utils.data
import
get_data
,
load_fixture
sample_textfile
=
"
text_ascii1
"
sampletext
=
load_fixture
(
sample_textfile
)
def
make_socket
(
path
):
if
os
.
path
.
exists
(
path
):
os
.
remove
(
path
)
sock
=
socket
.
socket
(
socket
.
AF_UNIX
,
socket
.
SOCK_STREAM
)
sock
.
bind
(
path
)
return
specialize
(
FilesystemFile
(
path
))
def
make_pipe
(
path
):
if
os
.
path
.
exists
(
path
):
os
.
remove
(
path
)
os
.
mkfifo
(
path
)
return
specialize
(
FilesystemFile
(
path
))
@pytest.fixture
def
endpoints
(
tmpdir
):
def
makename
(
tag
):
return
os
.
path
.
join
(
tmpdir
,
"
test_
"
+
tag
)
test_points
=
zip
([
make_socket
,
make_socket
,
make_pipe
,
make_pipe
],
[
"
socket1
"
,
"
socket2
"
,
"
pipe1
"
,
"
pipe2
"
])
return
[(
name
,
f
(
name
))
for
(
f
,
name
)
in
[(
f
,
makename
(
tag
))
for
(
f
,
tag
)
in
test_points
]]
@pytest.fixture
def
expected_results
(
endpoints
):
descriptions
=
[
format_socket
(
obj
.
get_type
(),
path
)
for
(
path
,
obj
)
in
endpoints
]
[
sock1_desc
,
sock2_desc
,
pipe1_desc
,
pipe2_desc
]
=
descriptions
# Prefix every line of the sample text file with '+' to predict RHS of the diff
sampletext_contents
=
get_data
(
sample_textfile
)
sample_lines
=
sampletext_contents
.
count
(
'
\n
'
)
added_text
=
'
+
'
+
'
\n
+
'
.
join
(
sampletext_contents
.
split
(
'
\n
'
)[:
-
1
])
+
'
\n
'
sock_text_diff
=
"
@@ -1 +1,{} @@
\n
"
.
format
(
sample_lines
)
+
"
-
"
+
sock1_desc
+
added_text
pipe_text_diff
=
"
@@ -1 +1,{} @@
\n
"
.
format
(
sample_lines
)
+
"
-
"
+
pipe1_desc
+
added_text
sock_sock_diff
=
"
@@ -1 +1 @@
\n
"
+
"
-
"
+
sock1_desc
+
"
+
"
+
sock2_desc
pipe_pipe_diff
=
"
@@ -1 +1 @@
\n
"
+
"
-
"
+
pipe1_desc
+
"
+
"
+
pipe2_desc
sock_pipe_diff
=
"
@@ -1 +1 @@
\n
"
+
"
-
"
+
sock1_desc
+
"
+
"
+
pipe1_desc
pipe_sock_diff
=
"
@@ -1 +1 @@
\n
"
+
"
-
"
+
pipe1_desc
+
"
+
"
+
sock1_desc
return
(
sock_text_diff
,
pipe_text_diff
,
sock_sock_diff
,
pipe_pipe_diff
,
sock_pipe_diff
,
pipe_sock_diff
)
def
test_sockets
(
endpoints
,
expected_results
,
sampletext
):
(
names
,
objects
)
=
zip
(
*
endpoints
)
(
sock1
,
sock2
,
pipe1
,
pipe2
)
=
objects
(
sock_text_diff
,
pipe_text_diff
,
sock_sock_diff
,
pipe_pipe_diff
,
sock_pipe_diff
,
pipe_sock_diff
)
=
expected_results
assert
isinstance
(
sock1
,
SocketOrFIFO
)
assert
isinstance
(
pipe1
,
SocketOrFIFO
)
assert
sock1
.
compare
(
sampletext
).
unified_diff
==
sock_text_diff
assert
pipe1
.
compare
(
sampletext
).
unified_diff
==
pipe_text_diff
assert
sock1
.
compare
(
sock1
)
==
None
assert
pipe1
.
compare
(
pipe1
)
==
None
assert
sock1
.
compare
(
sock2
).
unified_diff
==
sock_sock_diff
assert
pipe1
.
compare
(
pipe2
).
unified_diff
==
pipe_pipe_diff
assert
sock1
.
compare
(
pipe1
).
unified_diff
==
sock_pipe_diff
assert
pipe1
.
compare
(
sock1
).
unified_diff
==
pipe_sock_diff
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment