From 7e5f57533f4c41d1ff1103ba14fc58208f458d6d Mon Sep 17 00:00:00 2001 From: "adam.wu" Date: Sun, 27 Apr 2025 22:21:31 +0800 Subject: [PATCH] remove useless test case Signed-off-by: wujunwei Signed-off-by: adam.wu --- pkg/chart/v2/util/dependencies_test.go | 40 ------------------ .../Chart.lock | 0 .../Chart.yaml | 0 .../charts/test-0.1.0.tgz | Bin .../templates/autoscaler.yaml | 0 .../values.yaml | 0 .../Chart.lock | 9 ---- .../Chart.yaml | 12 ------ .../charts/test-0.1.0.tgz | Bin 584 -> 0 bytes .../charts/test-0.2.0.tgz | Bin 584 -> 0 bytes .../templates/autoscaler.yaml | 16 ------- .../values.yaml | 11 ----- 12 files changed, 88 deletions(-) rename pkg/{chartutil => chart/v2/util}/testdata/dependent-chart-with-different-alias-name-same-version/Chart.lock (100%) rename pkg/{chartutil => chart/v2/util}/testdata/dependent-chart-with-different-alias-name-same-version/Chart.yaml (100%) rename pkg/{chartutil => chart/v2/util}/testdata/dependent-chart-with-different-alias-name-same-version/charts/test-0.1.0.tgz (100%) rename pkg/{chartutil => chart/v2/util}/testdata/dependent-chart-with-different-alias-name-same-version/templates/autoscaler.yaml (100%) rename pkg/{chartutil => chart/v2/util}/testdata/dependent-chart-with-different-alias-name-same-version/values.yaml (100%) delete mode 100644 pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.lock delete mode 100644 pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.yaml delete mode 100644 pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.1.0.tgz delete mode 100644 pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.2.0.tgz delete mode 100644 pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/templates/autoscaler.yaml delete mode 100644 pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/values.yaml diff --git a/pkg/chart/v2/util/dependencies_test.go b/pkg/chart/v2/util/dependencies_test.go index d9b5c31e4..0895887eb 100644 --- a/pkg/chart/v2/util/dependencies_test.go +++ b/pkg/chart/v2/util/dependencies_test.go @@ -586,46 +586,6 @@ func TestChartWithDependencyAliasedTwiceAndDoublyReferencedSubDependency(t *test validateDependencyTree(t, c) } -func TestDependencyWithSameNameDifferentVersion(t *testing.T) { - type M = map[string]interface{} - tests := []struct { - name string - v M - charts []string // expected dependent charts names - versions []string // expected dependent charts versions - }{ - { - "same name subcharts enbale one", - M{"one": M{"enabled": true}, "two": M{"enabled": false}}, - []string{"parent-chart.test"}, - []string{"0.1.0"}, - }, - { - "same name subcharts enbale another one", - M{"one": M{"enabled": false}, "two": M{"enabled": true}}, - []string{"parent-chart.test"}, - []string{"0.2.0"}, - }, - } - - for _, tc := range tests { - c := loadChart(t, "testdata/dependent-chart-with-same-name-different-version") - t.Run(tc.name, func(t *testing.T) { - if err := processDependencyEnabled(c, tc.v, ""); err != nil { - t.Fatalf("error processing enabled dependencies %v", err) - } - if len(c.Dependencies()) != len(tc.charts) { - t.Fatalf("slice lengths do not match got %v, expected %v", len(c.Dependencies()), len(tc.charts)) - } - for i, d := range c.Dependencies() { - if d.Metadata.Version != tc.versions[i] { - t.Fatalf("slice values do not match got %v, expected %v", tc.versions[i], d.Metadata.Version) - } - } - }) - } -} - func TestDependencyWithDifferentAliasNameSameVersion(t *testing.T) { type M = map[string]interface{} tests := []struct { diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/Chart.lock b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/Chart.lock similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/Chart.lock rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/Chart.lock diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/Chart.yaml rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/charts/test-0.1.0.tgz b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/charts/test-0.1.0.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/charts/test-0.1.0.tgz rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/charts/test-0.1.0.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/templates/autoscaler.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/templates/autoscaler.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/templates/autoscaler.yaml rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/templates/autoscaler.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-different-alias-name-same-version/values.yaml rename to pkg/chart/v2/util/testdata/dependent-chart-with-different-alias-name-same-version/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.lock b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.lock deleted file mode 100644 index b2f17fb39..000000000 --- a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.lock +++ /dev/null @@ -1,9 +0,0 @@ -dependencies: -- name: dev - repository: file://envs/dev - version: v0.1.0 -- name: prod - repository: file://envs/prod - version: v0.1.0 -digest: sha256:9403fc24f6cf9d6055820126cf7633b4bd1fed3c77e4880c674059f536346182 -generated: "2020-02-03T10:38:51.180474+01:00" diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.yaml b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.yaml deleted file mode 100644 index 1db9388db..000000000 --- a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: parent-chart -version: 0.1.0 -appVersion: v0.1.0 -dependencies: - - name: test - version: "0.1.0" - condition: one.enabled - - - name: test - version: "0.2.0" - condition: two.enabled \ No newline at end of file diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.1.0.tgz b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.1.0.tgz deleted file mode 100644 index 33390b31bc17bb4061df0de8917829da1e247d32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmV-O0=NAiiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI##Z<{<6%`;N|!~L4)5JL#j$6M7s>}iXlweNRums$hcvmMkl z;=fP9OCV@#)^Mrh`02RL@ZMYN(l%a=8HIK{>eC7!(D1qHR z@ydP4Ro+^AkJqF2e~I~;%-I6ql>etJ?)pCp!`}awzz7yvX5e-JDAXkEINhBGwedff zq&3edIVz2nmYGKnN@{Bo4k!zijagPAFw$h}Slio7`1s6+FIZx3f5H>VE zH1zC1ThuGEH;da_%X9vSmP@f9oszJ)q6Gf$lj!BB{covIIa)H4=5Gc6E)GukKZxh^ zj{j%VnDzd@1V-n_&>J142i!}|AEmIEgOXV*A%@;X7?o=H;4(sv3GmQCiPh_kF1| zZ%N;33gAexQf5*HU&&(Ns!sF=Qn}m|B&=iqC~sFjis0=QH2qj}O&MHW?+yc=fq&<2 z1&2iUn^pO(b|7K(<}ks3SAXC6OG-QTUm&Gvf3B2Pr;~E(sCmA+r)NB+@ab--s<)1h W9zA-zWBd#N0RR7F>guxq5&!^W_8d|G diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.2.0.tgz b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/charts/test-0.2.0.tgz deleted file mode 100644 index 347032915ba49a272da85b3468dddeb3ee0f0b06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmV-O0=NAiiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI##Z<{<6%`;N|!~L4)5JL#)etJKK6eU#=ZY9ff3BL%)#vdP^d}Rakf1V8smSi zNNb)`dQciGEpv|^l+@Ow9zc#3w5*VEyLvM7D9&j%;f0V*v0ZQhbgcy1kk<-2N>^{!La#96D?>iTH3Lp0h z=Q6+U=qt%$6Lv!nz}<{C8}JuY5E}A7VM$QeU!uIMOiaz)Ayyx zyaj!0D1ZaWN|{L&d?ky4t2)siNELEjlCX~bqr7eTAc8j=(DY-)HRW)1y*&(g4*s3H z73>q;Z&&4a+JS`C>-_}(UHyIMFDc#Fe}R;?{kc*)oleTBqvrYQo}TfP!l%2TuHQO7 Wdi3b=j`1@90RR6b*Fu&65&!^xtQUI# diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/templates/autoscaler.yaml b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/templates/autoscaler.yaml deleted file mode 100644 index 976e5a8f1..000000000 --- a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/templates/autoscaler.yaml +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################################### -# parent-chart horizontal pod autoscaler -################################################################################################### -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ .Release.Name }}-autoscaler - namespace: {{ .Release.Namespace }} -spec: - scaleTargetRef: - apiVersion: apps/v1beta1 - kind: Deployment - name: {{ .Release.Name }} - minReplicas: {{ required "A valid .Values.resources.autoscaler.minReplicas entry required!" .Values.resources.autoscaler.minReplicas }} - maxReplicas: {{ required "A valid .Values.resources.autoscaler.maxReplicas entry required!" .Values.resources.autoscaler.maxReplicas }} - targetCPUUtilizationPercentage: {{ required "A valid .Values.resources.autoscaler.targetCPUUtilizationPercentage!" .Values.resources.autoscaler.targetCPUUtilizationPercentage }} \ No newline at end of file diff --git a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/values.yaml b/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/values.yaml deleted file mode 100644 index 3424c6547..000000000 --- a/pkg/chartutil/testdata/dependent-chart-with-same-name-different-version/values.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# Default values for parent-chart. -nameOverride: parent-chart -one: - enabled: false -two: - enabled: true -resources: - autoscaler: - minReplicas: 0 - maxReplicas: 0 - targetCPUUtilizationPercentage: 99 \ No newline at end of file