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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos
Commits
e8ca0c42
Commit
e8ca0c42
authored
Oct 22, 2021
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/trafficserver: Version up
Relax Via string and define it once in caddy-frontend.
parent
491f0806
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
component/trafficserver/buildout.cfg
component/trafficserver/buildout.cfg
+2
-2
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+12
-6
No files found.
component/trafficserver/buildout.cfg
View file @
e8ca0c42
...
...
@@ -23,8 +23,8 @@ min_version = 8
[trafficserver]
recipe = slapos.recipe.cmmi
url = http://apache.claz.org/trafficserver/trafficserver-9.
0.2
.tar.bz2
md5sum =
4df67ada24665116bafedd71503215cb
url = http://apache.claz.org/trafficserver/trafficserver-9.
1.0
.tar.bz2
md5sum =
994b0aa879cbd95054048f34bf8ed954
shared = true
patch-options = -p1
configure-options =
...
...
software/caddy-frontend/test/test.py
View file @
e8ca0c42
...
...
@@ -92,6 +92,12 @@ KEDIFA_PORT = '15080'
# has to be not partition one
SOURCE_IP
=
'127.0.0.1'
# ATS version expectation in Via string
VIA_STRING
=
(
r'^http\
/
1.1 caddy-frontend-1\
[.*
\] '
r'\
(Ap
acheTrafficServer\
/9
\.[0-9]\
.[
0-9]+\
)$
',
)[0]
# IP on which test run, in order to mimic HTTP[s] access
TEST_IP = os.environ['
SLAPOS_TEST_IPV4
']
...
...
@@ -3579,7 +3585,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]+\
)$
'
VIA_STRING
)
def
test_enable_cache_server_alias
(
self
):
...
...
@@ -3621,7 +3627,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertNotEqual
(
via
,
None
)
self
.
assertRegexpMatches
(
via
,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
VIA_STRING
)
result
=
fakeHTTPResult
(
...
...
@@ -3738,7 +3744,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertNotEqual
(
via
,
None
)
self
.
assertRegexpMatches
(
via
,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
VIA_STRING
)
# BEGIN: Check that squid.log is correctly filled in
...
...
@@ -3940,7 +3946,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertNotEqual
(
via
,
None
)
self
.
assertRegexpMatches
(
via
,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
VIA_STRING
)
# check stale-if-error support is really respected if not present in the
...
...
@@ -4083,7 +4089,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertNotEqual
(
via
,
None
)
self
.
assertRegexpMatches
(
via
,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
VIA_STRING
)
try
:
...
...
@@ -4130,7 +4136,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self
.
assertNotEqual
(
via
,
None
)
self
.
assertRegexpMatches
(
via
,
r'
^
http
\
/
1.1
caddy
-
frontend
-
1
\
[.
*
\
]
\
(
ApacheTrafficServer
\
/
9
\
.
0
\
.[
0
-
9
]
+
\
)
$
'
VIA_STRING
)
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