Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the Cheetah template renderer in salt.utils.templates, and unit-tests for Jinja, Cheetah, Mako, Genshi, wempy templates, #51718

Merged
merged 15 commits into from
Dec 18, 2019
Merged

Fix the Cheetah template renderer in salt.utils.templates, and unit-tests for Jinja, Cheetah, Mako, Genshi, wempy templates, #51718

merged 15 commits into from
Dec 18, 2019

Commits on Dec 17, 2019

  1. Fix the Cheetah template renderer in salt.utils.templates.

    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    50cd57d View commit details
    Browse the repository at this point in the history

  2. Modified the render_cheetah_tmpl() function in salt.util.templates to… 

    … call the correct methods depending on Python2 vs Python3.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    bd60898 View commit details
    Browse the repository at this point in the history

  3. Ugh..Added unit tests for rendering all of the template types as unit… 

    ….utils.test_templates since nobody has done this.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    0e6e793 View commit details
    Browse the repository at this point in the history

  4. Fixed lint issues in the new unit tests for tests.unit.utils.test_tem… 

    …plates.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    b93200c View commit details
    Browse the repository at this point in the history

  5. Added all of the template packages (Cheetah3, Genshi, Mako, wempy) to… 

    … all of the files under requirements/static/py* with the hopes that the unit-tests pick them up.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    be70b9d View commit details
    Browse the repository at this point in the history

  6. Revert "Added all of the template packages (Cheetah3, Genshi, Mako, w… 

    …empy) to all of the files under requirements/static/py* with the hopes that the unit-tests pick them up."

This reverts commit 80bab2727399a0c1ae79b611d2615b9b1c84363c as apparently it didn't work.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    8734cd9 View commit details
    Browse the repository at this point in the history

  7. Added all of the template packages (Cheetah3, Genshi, Mako, wempy) to… 

    … the requirements.txt file with the hope that the unit-tests will pick them up.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    d95774e View commit details
    Browse the repository at this point in the history

  8. Revert "Added all of the template packages (Cheetah3, Genshi, Mako, w… 

    …empy) to the requirements.txt file with the hope that the unit-tests will pick them up."

This reverts commit 00613c40d8775fb2ac75374092372471063b5a87 as apparently wempy's setup doesn't work properly on Python3.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    c6fd7ca View commit details
    Browse the repository at this point in the history

  9. Added all of the available template packages (Cheetah3, Genshi, Mako,… 

    … wempy) to the requirements/base.txt file with the hope that the unit-tests will pick them up properly.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    a944de4 View commit details
    Browse the repository at this point in the history

  10. Fixed a copy-pasta error in the unit.utils.test_templates test that r… 

    …esulted in rendering with genshi for a test that should've been against wempy.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    56143af View commit details
    Browse the repository at this point in the history

  11. Re-fixed the copy-pasta error in the wempy_variable test from unit.ut… 

    …ils.test_templates so it doesn't check for xml that wasn't defined in the template.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    7a3f696 View commit details
    Browse the repository at this point in the history

  12. Revert "Added all of the available template packages (Cheetah3, Gensh… 

    …i, Mako, wempy) to the requirements/base.txt file with the hope that the unit-tests will pick them up properly."

This reverts commit 43f9a0a3f9dd3498cb3b136104d1810e271381fb.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    41a3023 View commit details
    Browse the repository at this point in the history

  13. Added all of the available template packages (Cheetah3, Genshi, Mako,… 

    … wempy) to the requirements/static/*.in files so that the unit-tests will pick them up properly (credit to @Ch3LL and @s0undt3ch).
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    017acd2 View commit details
    Browse the repository at this point in the history

  14. Updated all of the testing requirements using pre-commit.

    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    cd3744d View commit details
    Browse the repository at this point in the history

  15. Moved the context in tests.unit.utils.test_templates within the scope… 

    … of the RenderTestCase class.
    @arizvisa
    arizvisa committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    72861ef View commit details
    Browse the repository at this point in the history