You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by cm...@apache.org on 2024/04/26 15:24:51 UTC

(trafficserver) 08/10: txn_box autests: prefix each with 'txn_box' (#11286)

This is an automated email from the ASF dual-hosted git repository.

cmcfarlen pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit fa681070fdfd775b90f7650d1f9603046e8bc9da
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Wed Apr 24 13:02:04 2024 -0500

    txn_box autests: prefix each with 'txn_box' (#11286)
    
    I noticed the following warning in our CI:
    
    ```
    Warning: overiding test tls with test in /var/tmp/trafficserver/tests/gold_tests/pluginTest/txn_box/basic
    Warning: overiding test basic with test in /var/tmp/trafficserver/tests/gold_tests/pluginTest/txn_box/basic
    Warning: overiding test redirect with test in /var/tmp/trafficserver/tests/gold_tests/pluginTest/txn_box/basic
    ```
    
    This indicates that our new txn_box autests have naming conflicts with
    previously created ATS autests ("basic", "tls", "redirect", to be
    specific). This patch disambiguates these tests by prefixing each
    txn_box autest with "txn_box". In addition to resolving the naming
    conflicts, this also identifies the tests as txn_box for users seeing
    the tests run and allows regex matching on them.
    
    (cherry picked from commit 3a3c4149a94449a6f4203278dabf47e6f4951e7c)
---
 .../pluginTest/txn_box/basic/{basic.test.py => txn_box_basic.test.py}     | 0
 .../pluginTest/txn_box/basic/{cmp.test.py => txn_box_cmp.test.py}         | 0
 .../pluginTest/txn_box/basic/{ip-addr.test.py => txn_box_ip-addr.test.py} | 0
 .../pluginTest/txn_box/basic/{mod.test.py => txn_box_mod.test.py}         | 0
 .../txn_box/basic/{multi-cfg.test.py => txn_box_multi-cfg.test.py}        | 0
 .../txn_box/basic/{redirect.test.py => txn_box_redirect.test.py}          | 0
 .../pluginTest/txn_box/basic/{reply.test.py => txn_box_reply.test.py}     | 0
 .../pluginTest/txn_box/basic/{rxp.test.py => txn_box_rxp.test.py}         | 0
 .../pluginTest/txn_box/basic/{stat.test.py => txn_box_stat.test.py}       | 0
 .../txn_box/basic/{tls-cert.test.py => txn_box_tls-cert.test.py}          | 0
 .../pluginTest/txn_box/basic/{tls.test.py => txn_box_tls.test.py}         | 0
 .../pluginTest/txn_box/basic/{tuple.test.py => txn_box_tuple.test.py}     | 0
 .../txn_box/basic/{txn-debug.test.py => txn_box_txn-debug.test.py}        | 0
 .../txn_box/basic/{txn-error.test.py => txn_box_txn-error.test.py}        | 0
 .../txn_box/basic/{txn_open_1.test.py => txn_box_txn_open_1.test.py}      | 0
 .../txn_box/basic/{txn_open_2.test.py => txn_box_txn_open_2.test.py}      | 0
 .../txn_box/basic/{txn_open_3.test.py => txn_box_txn_open_3.test.py}      | 0
 .../pluginTest/txn_box/basic/{with.test.py => txn_box_with.test.py}       | 0
 .../txn_box/ct_header/{ct_header.test.py => txn_box_ct_header.test.py}    | 0
 .../example/{accept-encoding.test.py => txn_box_accept-encoding.test.py}  | 0
 .../txn_box/prod/{cors-origin.test.py => txn_box_cors-origin.test.py}     | 0
 .../txn_box/prod/{cors-referrer.test.py => txn_box_cors-referrer.test.py} | 0
 .../pluginTest/txn_box/prod/{ip-acl.test.py => txn_box_ip-acl.test.py}    | 0
 .../pluginTest/txn_box/prod/{mTLS.test.py => txn_box_mTLS.test.py}        | 0
 .../{query-delete-filter.test.py => txn_box_query-delete-filter.test.py}  | 0
 .../{query-delete-regex.test.py => txn_box_query-delete-regex.test.py}    | 0
 .../pluginTest/txn_box/prod/{query.test.py => txn_box_query.test.py}      | 0
 .../pluginTest/txn_box/prod/{stanley.test.py => txn_box_stanley.test.py}  | 0
 .../txn_box/prod/{vznith-1.test.py => txn_box_vznith-1.test.py}           | 0
 .../txn_box/prod/{yts-3489.test.py => txn_box_yts-3489.test.py}           | 0
 .../txn_box/ramp/{multi-ramp-1.test.py => txn_box_multi-ramp-1.test.py}   | 0
 .../txn_box/ramp/{multi-ramp-2.test.py => txn_box_multi-ramp-2.test.py}   | 0
 .../txn_box/ramp/{multi-ramp-3.test.py => txn_box_multi-ramp-3.test.py}   | 0
 .../pluginTest/txn_box/ramp/{ramp.test.py => txn_box_ramp.test.py}        | 0
 .../txn_box/remap/{remap-base.test.py => txn_box_remap-base.test.py}      | 0
 .../pluginTest/txn_box/smoke/{smoke-2.test.py => txn_box_smoke-2.test.py} | 0
 .../pluginTest/txn_box/smoke/{smoke.test.py => txn_box_smoke.test.py}     | 0
 .../static_file/{static_file.test.py => txn_box_static_file.test.py}      | 0
 38 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/gold_tests/pluginTest/txn_box/basic/basic.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_basic.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/basic.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_basic.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/cmp.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_cmp.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/cmp.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_cmp.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/ip-addr.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_ip-addr.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/ip-addr.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_ip-addr.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/mod.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_mod.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/mod.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_mod.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/multi-cfg.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_multi-cfg.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/multi-cfg.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_multi-cfg.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/redirect.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_redirect.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/redirect.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_redirect.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/reply.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_reply.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/reply.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_reply.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/rxp.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_rxp.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/rxp.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_rxp.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/stat.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_stat.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/stat.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_stat.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/tls-cert.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls-cert.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/tls-cert.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls-cert.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/tls.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/tls.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/tuple.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tuple.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/tuple.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_tuple.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn-debug.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-debug.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/txn-debug.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-debug.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn-error.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-error.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/txn-error.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-error.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_open_1.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_1.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/txn_open_1.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_1.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_open_2.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_2.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/txn_open_2.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_2.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_open_3.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_3.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/txn_open_3.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_3.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/basic/with.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_with.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/basic/with.test.py
rename to tests/gold_tests/pluginTest/txn_box/basic/txn_box_with.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/ct_header/ct_header.test.py b/tests/gold_tests/pluginTest/txn_box/ct_header/txn_box_ct_header.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/ct_header/ct_header.test.py
rename to tests/gold_tests/pluginTest/txn_box/ct_header/txn_box_ct_header.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/example/accept-encoding.test.py b/tests/gold_tests/pluginTest/txn_box/example/txn_box_accept-encoding.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/example/accept-encoding.test.py
rename to tests/gold_tests/pluginTest/txn_box/example/txn_box_accept-encoding.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/cors-origin.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-origin.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/cors-origin.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-origin.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/cors-referrer.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-referrer.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/cors-referrer.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-referrer.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/ip-acl.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_ip-acl.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/ip-acl.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_ip-acl.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/mTLS.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_mTLS.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/mTLS.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_mTLS.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/query-delete-filter.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-filter.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/query-delete-filter.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-filter.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/query-delete-regex.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-regex.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/query-delete-regex.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-regex.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/query.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/query.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_query.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/stanley.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_stanley.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/stanley.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_stanley.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/vznith-1.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_vznith-1.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/vznith-1.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_vznith-1.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/prod/yts-3489.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_yts-3489.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/prod/yts-3489.test.py
rename to tests/gold_tests/pluginTest/txn_box/prod/txn_box_yts-3489.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/ramp/multi-ramp-1.test.py b/tests/gold_tests/pluginTest/txn_box/ramp/txn_box_multi-ramp-1.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/ramp/multi-ramp-1.test.py
rename to tests/gold_tests/pluginTest/txn_box/ramp/txn_box_multi-ramp-1.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/ramp/multi-ramp-2.test.py b/tests/gold_tests/pluginTest/txn_box/ramp/txn_box_multi-ramp-2.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/ramp/multi-ramp-2.test.py
rename to tests/gold_tests/pluginTest/txn_box/ramp/txn_box_multi-ramp-2.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/ramp/multi-ramp-3.test.py b/tests/gold_tests/pluginTest/txn_box/ramp/txn_box_multi-ramp-3.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/ramp/multi-ramp-3.test.py
rename to tests/gold_tests/pluginTest/txn_box/ramp/txn_box_multi-ramp-3.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/ramp/ramp.test.py b/tests/gold_tests/pluginTest/txn_box/ramp/txn_box_ramp.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/ramp/ramp.test.py
rename to tests/gold_tests/pluginTest/txn_box/ramp/txn_box_ramp.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/remap/remap-base.test.py b/tests/gold_tests/pluginTest/txn_box/remap/txn_box_remap-base.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/remap/remap-base.test.py
rename to tests/gold_tests/pluginTest/txn_box/remap/txn_box_remap-base.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/smoke/smoke-2.test.py b/tests/gold_tests/pluginTest/txn_box/smoke/txn_box_smoke-2.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/smoke/smoke-2.test.py
rename to tests/gold_tests/pluginTest/txn_box/smoke/txn_box_smoke-2.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/smoke/smoke.test.py b/tests/gold_tests/pluginTest/txn_box/smoke/txn_box_smoke.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/smoke/smoke.test.py
rename to tests/gold_tests/pluginTest/txn_box/smoke/txn_box_smoke.test.py
diff --git a/tests/gold_tests/pluginTest/txn_box/static_file/static_file.test.py b/tests/gold_tests/pluginTest/txn_box/static_file/txn_box_static_file.test.py
similarity index 100%
rename from tests/gold_tests/pluginTest/txn_box/static_file/static_file.test.py
rename to tests/gold_tests/pluginTest/txn_box/static_file/txn_box_static_file.test.py