From 2e65b42f05bcc1401d1489e751993ec197f6942c Mon Sep 17 00:00:00 2001 From: pasha-codefresh Date: Thu, 24 Mar 2022 23:42:34 +0200 Subject: [PATCH] fix: Format condition incosistent test (#8895) * add to approvers Signed-off-by: pashavictorovich * fix issue with format condition test Signed-off-by: pashavictorovich * Trigger Build Signed-off-by: pashavictorovich * work with specific jinja version Signed-off-by: pashavictorovich --- cmd/argocd/commands/app_test.go | 2 +- docs/requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/argocd/commands/app_test.go b/cmd/argocd/commands/app_test.go index 5bdf76a9568c3..dba3c2ce67706 100644 --- a/cmd/argocd/commands/app_test.go +++ b/cmd/argocd/commands/app_test.go @@ -336,7 +336,7 @@ func TestFormatConditionSummary(t *testing.T) { } summary := formatConditionsSummary(app) - if summary != "type1(2),type2" { + if summary != "type1(2),type2" && summary != "type2,type1(2)" { t.Fatalf("Incorrect summary %q, should be type1(2),type2", summary) } }) diff --git a/docs/requirements.txt b/docs/requirements.txt index faf48017ebc12..50064668f8dbb 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,5 @@ mkdocs==1.2.3 mkdocs-material==7.1.7 markdown_include==0.6.0 -pygments==2.7.4 \ No newline at end of file +pygments==2.7.4 +jinja2===3.0.3 \ No newline at end of file