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
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
7e57c915
Commit
7e57c915
authored
Jun 01, 2022
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Adapt to
a7ade748
parent
a6cc20c1
Pipeline
#21884
failed with stage
in 0 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+6
-6
No files found.
software/caddy-frontend/test/test.py
View file @
7e57c915
...
...
@@ -3577,7 +3577,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertNotEqual
(
via
,
None
)
self
.
assertRegexpMatches
(
via
,
r'^http\
/
1.1 caddy-frontend-1\
[.*
\] \
(Ap
acheTrafficServer\
/9
\.
0
\
.[
0-9]+\
)$
'
r'^http\
/
1.1 caddy-frontend-1\
[.*
\] \
(Ap
acheTrafficServer\
/9
\.
1
\
.[
0-9]+\
)$
'
)
def test_enable_cache_server_alias(self):
...
...
@@ -3619,7 +3619,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None)
self.assertRegexpMatches(
via,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
1
\
.[
0
-
9
]
+
\
)
$
'
)
result = fakeHTTPResult(
...
...
@@ -3736,7 +3736,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None)
self.assertRegexpMatches(
via,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
1
\
.[
0
-
9
]
+
\
)
$
'
)
# BEGIN: Check that squid.log is correctly filled in
...
...
@@ -3938,7 +3938,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None)
self.assertRegexpMatches(
via,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
1
\
.[
0
-
9
]
+
\
)
$
'
)
# check stale-if-error support is really respected if not present in the
...
...
@@ -4081,7 +4081,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None)
self.assertRegexpMatches(
via,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
1
\
.[
0
-
9
]
+
\
)
$
'
)
try:
...
...
@@ -4128,7 +4128,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None)
self.assertRegexpMatches(
via,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
1
\
.[
0
-
9
]
+
\
)
$
'
)
def test_enable_http2_false(self):
...
...
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