Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sso
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
ai
sso
Commits
8a4c673f
Commit
8a4c673f
authored
3 years ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
Use py3 print() syntax
parent
6c445b5e
Branches
Branches containing commit
No related tags found
1 merge request
!4
Drop Python 2 support
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/mod_sso/test/httpd_integration_test.py
+5
-5
5 additions, 5 deletions
src/mod_sso/test/httpd_integration_test.py
with
5 additions
and
5 deletions
src/mod_sso/test/httpd_integration_test.py
+
5
−
5
View file @
8a4c673f
...
@@ -70,19 +70,19 @@ def _stop_httpd(httpd):
...
@@ -70,19 +70,19 @@ def _stop_httpd(httpd):
status
=
httpd
.
wait
()
status
=
httpd
.
wait
()
if
os
.
WIFEXITED
(
status
):
if
os
.
WIFEXITED
(
status
):
if
os
.
WEXITSTATUS
(
status
)
!=
0
:
if
os
.
WEXITSTATUS
(
status
)
!=
0
:
print
'
WARNING: httpd exited with status %d
'
%
os
.
WEXITSTATUS
(
status
)
print
(
'
WARNING: httpd exited with status %d
'
%
os
.
WEXITSTATUS
(
status
)
)
dump_log
=
True
dump_log
=
True
elif
os
.
WIFSIGNALED
(
status
):
elif
os
.
WIFSIGNALED
(
status
):
print
'
WARNING: httpd exited due to signal %d
'
%
os
.
WTERMSIG
(
status
)
print
(
'
WARNING: httpd exited due to signal %d
'
%
os
.
WTERMSIG
(
status
)
)
dump_log
=
True
dump_log
=
True
else
:
else
:
print
'
WARNING: httpd exited for unknown reason (returncode=%d)
'
%
status
print
(
'
WARNING: httpd exited for unknown reason (returncode=%d)
'
%
status
)
dump_log
=
True
dump_log
=
True
if
dump_log
:
if
dump_log
:
with
open
(
APACHE_LOG
)
as
fd
:
with
open
(
APACHE_LOG
)
as
fd
:
for
line
in
fd
:
for
line
in
fd
:
print
line
.
rstrip
(
'
\n
'
)
print
(
line
.
rstrip
(
'
\n
'
)
)
for
f
in
(
'
public.key
'
,
'
test-httpd.pid
'
,
'
.apache_log
'
):
for
f
in
(
'
public.key
'
,
'
test-httpd.pid
'
,
'
.apache_log
'
):
try
:
try
:
...
@@ -239,7 +239,7 @@ class HttpdIntegrationTestBase(unittest.TestCase):
...
@@ -239,7 +239,7 @@ class HttpdIntegrationTestBase(unittest.TestCase):
]
]
for
name
,
check
in
checks
:
for
name
,
check
in
checks
:
for
i
in
xrange
(
repeats
):
for
i
in
xrange
(
repeats
):
print
'
CHECKING %s (%d of 10)
'
%
(
name
,
i
),
check
print
(
'
CHECKING %s (%d of 10)
'
%
(
name
,
i
),
check
)
status
,
body
,
location
=
_query
(
check
[
"
url
"
],
status
,
body
,
location
=
_query
(
check
[
"
url
"
],
host
=
check
.
get
(
"
http_host
"
),
host
=
check
.
get
(
"
http_host
"
),
cookie
=
check
.
get
(
"
cookie
"
))
cookie
=
check
.
get
(
"
cookie
"
))
...
...
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