You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2019/02/01 00:10:38 UTC
[trafficserver] branch master updated: Adding back the cookie_remap
unit tests. Running cookie_remap autests conditionally only if the plugin
is built.
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 7eb4b24 Adding back the cookie_remap unit tests. Running cookie_remap autests conditionally only if the plugin is built.
7eb4b24 is described below
commit 7eb4b24787ac15a7502be80002eb01ef0c0e0dda
Author: Pushkar Pradhan <pp...@oath.com>
AuthorDate: Thu Jan 31 15:24:30 2019 -0800
Adding back the cookie_remap unit tests.
Running cookie_remap autests conditionally only if the plugin is built.
---
plugins/experimental/cookie_remap/Makefile.inc | 10 ++++++++++
.../{unit_tests/cookiejar/unit_test.cc => test_cookiejar.cc} | 0
tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py | 1 +
.../gold_tests/pluginTest/cookie_remap/collapseslashes.test.py | 1 +
tests/gold_tests/pluginTest/cookie_remap/connector.test.py | 1 +
tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py | 1 +
tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py | 1 +
tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py | 1 +
tests/gold_tests/pluginTest/cookie_remap/matrixparams.test.py | 1 +
.../gold_tests/pluginTest/cookie_remap/notexistscookie.test.py | 1 +
tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py | 1 +
tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py | 1 +
tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py | 1 +
tests/gold_tests/pluginTest/cookie_remap/substitute.test.py | 1 +
14 files changed, 22 insertions(+)
diff --git a/plugins/experimental/cookie_remap/Makefile.inc b/plugins/experimental/cookie_remap/Makefile.inc
index 11de3ac..4af577d 100644
--- a/plugins/experimental/cookie_remap/Makefile.inc
+++ b/plugins/experimental/cookie_remap/Makefile.inc
@@ -27,4 +27,14 @@ experimental_cookie_remap_cookie_remap_la_LDFLAGS = \
AM_CPPFLAGS += @YAMLCPP_INCLUDES@
+check_PROGRAMS += \
+ experimental/cookie_remap/test_cookiejar
+
+experimental_cookie_remap_test_cookiejar_CPPFLAGS = $(AM_CPPFLAGS) -Iexperimental/cookie_remap -I$(abs_top_srcdir)/tests/include
+experimental_cookie_remap_test_cookiejar_SOURCES = \
+ experimental/cookie_remap/test_cookiejar.cc \
+ experimental/cookie_remap/strip.c \
+ experimental/cookie_remap/cookiejar.cc \
+ experimental/cookie_remap/cookiejar.h
+
# vim: ft=make ts=8 sw=8 et:
diff --git a/plugins/experimental/cookie_remap/unit_tests/cookiejar/unit_test.cc b/plugins/experimental/cookie_remap/test_cookiejar.cc
similarity index 100%
rename from plugins/experimental/cookie_remap/unit_tests/cookiejar/unit_test.cc
rename to plugins/experimental/cookie_remap/test_cookiejar.cc
diff --git a/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py
index 4e1863a..86d4e50 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py b/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py
index 7cc647f..7f6db2a 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/connector.test.py b/tests/gold_tests/pluginTest/cookie_remap/connector.test.py
index 378b880..2f7c18e 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/connector.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/connector.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py
index 6f07b02..43598a7 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py
index bafb0ef..cad5981 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py b/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py
index 706f353..bb96814 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/matrixparams.test.py b/tests/gold_tests/pluginTest/cookie_remap/matrixparams.test.py
index 0d8ca8d..68529ba 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/matrixparams.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/matrixparams.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py
index 6028ec8..c645ca5 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py
index bf0c594..ad78ec8 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py b/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py
index 34c0b34..bcbeb3b 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py
index 0716689..f8d3d17 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py b/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py
index 7a5dfe5..273016c 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py
@@ -20,6 +20,7 @@ import os
Test.Summary = '''
'''
+Test.SkipUnless(Condition.PluginExists('cookie_remap.so'))
# need Curl
Test.SkipUnless(
Condition.HasProgram("curl", "Curl need to be installed on system for this test to work")