Commit 7e57c915 authored by Łukasz Nowak's avatar Łukasz Nowak

caddy-frontend: Adapt to a7ade748

parent a6cc20c1
...@@ -3577,7 +3577,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3577,7 +3577,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None) self.assertNotEqual(via, None)
self.assertRegexpMatches( self.assertRegexpMatches(
via, 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_cache_server_alias(self): def test_enable_cache_server_alias(self):
...@@ -3619,7 +3619,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3619,7 +3619,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None) self.assertNotEqual(via, None)
self.assertRegexpMatches( self.assertRegexpMatches(
via, 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( result = fakeHTTPResult(
...@@ -3736,7 +3736,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3736,7 +3736,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None) self.assertNotEqual(via, None)
self.assertRegexpMatches( self.assertRegexpMatches(
via, 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 # BEGIN: Check that squid.log is correctly filled in
...@@ -3938,7 +3938,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -3938,7 +3938,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None) self.assertNotEqual(via, None)
self.assertRegexpMatches( self.assertRegexpMatches(
via, 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 # check stale-if-error support is really respected if not present in the
...@@ -4081,7 +4081,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -4081,7 +4081,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None) self.assertNotEqual(via, None)
self.assertRegexpMatches( self.assertRegexpMatches(
via, 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: try:
...@@ -4128,7 +4128,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -4128,7 +4128,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
self.assertNotEqual(via, None) self.assertNotEqual(via, None)
self.assertRegexpMatches( self.assertRegexpMatches(
via, 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): def test_enable_http2_false(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment