Merge pull request #31 from tempesta-tech/ao-1033

Tests adaptation for new header name format in HTTP tables directives.
tempesta-tech · Jul 18, 2018 · ca61c83 · ca61c83
2 parents baf0ad0 + 3f7b633
commit ca61c83
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/http_rules/test_http.py b/http_rules/test_http.py
@@ -25,12 +25,14 @@ class HttpRules(functional.FunctionalTest):
         '  host == "static.*" -> host_p;\n'
         '  host == "*tempesta-tech.com" -> host_s;\n'
         '  host == "foo.example.com" -> host_e;\n'
-        '  hdr_host == "bar.*" -> hdr_h_p;\n'
-        '  hdr_host == "buzz.natsys-lab.com" -> hdr_h_e;\n'
-        '  hdr_host == "*natsys-lab.com" -> hdr_h_s;\n'
-        '  hdr_ref ==  "example.com" -> hdr_r_e;\n'
-        '  hdr_ref ==  "*.com" -> hdr_r_s;\n'
-        '  hdr_ref ==  "http://example.com*" -> hdr_r_p;\n'
+        '  hdr Host == "bar.*" -> hdr_h_p;\n'
+        '  hdr host == "buzz.natsys-lab.com" -> hdr_h_e;\n'
+        '  hdr Host == "*natsys-lab.com" -> hdr_h_s;\n'
+        '  hdr Referer ==  "example.com" -> hdr_r_e;\n'
+        '  hdr Referer ==  "*.com" -> hdr_r_s;\n'
+        '  hdr referer ==  "http://example.com*" -> hdr_r_p;\n'
+        '  hdr From ==  "testuser@example.com" -> hdr_raw_e;\n'
+        '  hdr Warning ==  "172 *" -> hdr_raw_p;\n'
         '  -> default;\n'
         '}\n'
         '\n')
@@ -67,6 +69,8 @@ def create_servers(self):
             (('hdr_r_s'), ('/'), ('referer'), ('http://example.com')),
             (('hdr_r_p'), ('/'), ('referer'),
              ('http://example.com/cgi-bin/show.pl')),
+            (('hdr_raw_e'), ('/'), ('from'), ('testuser@example.com')),
+            (('hdr_raw_p'), ('/'), ('warning'), ('172 misc warning')),
             (('default'), ('/'), None, None)]
 
         for group, uri, header, value in server_options:

diff --git a/http_rules/test_http_tables.py b/http_rules/test_http_tables.py
@@ -136,12 +136,12 @@ class HttpTablesTest(tester.TempestaTest):
         -> block;
         }
         http_chain {
-        hdr_host == "test.app.com" -> chain2;
-        hdr_uagent == "Mozilla*" -> chain2;
-        hdr_ref == "*.com" -> chain1;
-        hdr_ref == "http://example.*" -> chain3;
-        hdr_host == "bad.host.com" -> block;
-        hdr_host == "bar*" -> vh5;
+        hdr Host == "test.app.com" -> chain2;
+        hdr User-Agent == "Mozilla*" -> chain2;
+        hdr Referer == "*.com" -> chain1;
+        hdr referer == "http://example.*" -> chain3;
+        hdr host == "bad.host.com" -> block;
+        hdr host == "bar*" -> vh5;
         mark == 1 -> vh7;
         mark == 2 -> vh6;
         mark == 3 -> vh5;