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

ref(tests): localize unit test fixtures to package #8189

Merged
merged 1 commit into from May 22, 2020
Merged

ref(tests): localize unit test fixtures to package #8189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/helm/template_test.go
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
)

var chartPath = "./../../pkg/chartutil/testdata/subpop/charts/subchart1"
var chartPath = "testdata/testcharts/subchart"

func TestTemplateCmd(t *testing.T) {
tests := []cmdTestCase{
Expand Down
28 changes: 14 additions & 14 deletions cmd/helm/testdata/output/template-name-template.txt
View file
Open in desktop
@@ -1,34 +1,34 @@
---
# Source: subchart1/templates/subdir/serviceaccount.yaml
# Source: subchart/templates/subdir/serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: subchart1-sa
name: subchart-sa
---
# Source: subchart1/templates/subdir/role.yaml
# Source: subchart/templates/subdir/role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: subchart1-role
name: subchart-role
rules:
- resources: ["*"]
verbs: ["get","list","watch"]
---
# Source: subchart1/templates/subdir/rolebinding.yaml
# Source: subchart/templates/subdir/rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: subchart1-binding
name: subchart-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: subchart1-role
name: subchart-role
subjects:
- kind: ServiceAccount
name: subchart1-sa
name: subchart-sa
namespace: default
---
# Source: subchart1/charts/subcharta/templates/service.yaml
# Source: subchart/charts/subcharta/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
Expand All @@ -45,7 +45,7 @@ spec:
selector:
app.kubernetes.io/name: subcharta
---
# Source: subchart1/charts/subchartb/templates/service.yaml
# Source: subchart/charts/subchartb/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
Expand All @@ -62,13 +62,13 @@ spec:
selector:
app.kubernetes.io/name: subchartb
---
# Source: subchart1/templates/service.yaml
# Source: subchart/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
name: subchart1
name: subchart
labels:
helm.sh/chart: "subchart1-0.1.0"
helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "foobar-YWJj-baz"
kube-version/major: "1"
kube-version/minor: "18"
Expand All @@ -81,4 +81,4 @@ spec:
protocol: TCP
name: nginx
selector:
app.kubernetes.io/name: subchart1
app.kubernetes.io/name: subchart
28 changes: 14 additions & 14 deletions cmd/helm/testdata/output/template-set.txt
View file
Open in desktop
@@ -1,34 +1,34 @@
---
# Source: subchart1/templates/subdir/serviceaccount.yaml
# Source: subchart/templates/subdir/serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: subchart1-sa
name: subchart-sa
---
# Source: subchart1/templates/subdir/role.yaml
# Source: subchart/templates/subdir/role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: subchart1-role
name: subchart-role
rules:
- resources: ["*"]
verbs: ["get","list","watch"]
---
# Source: subchart1/templates/subdir/rolebinding.yaml
# Source: subchart/templates/subdir/rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: subchart1-binding
name: subchart-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: subchart1-role
name: subchart-role
subjects:
- kind: ServiceAccount
name: subchart1-sa
name: subchart-sa
namespace: default
---
# Source: subchart1/charts/subcharta/templates/service.yaml
# Source: subchart/charts/subcharta/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
Expand All @@ -45,7 +45,7 @@ spec:
selector:
app.kubernetes.io/name: subcharta
---
# Source: subchart1/charts/subchartb/templates/service.yaml
# Source: subchart/charts/subchartb/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
Expand All @@ -62,13 +62,13 @@ spec:
selector:
app.kubernetes.io/name: subchartb
---
# Source: subchart1/templates/service.yaml
# Source: subchart/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
name: subchart1
name: subchart
labels:
helm.sh/chart: "subchart1-0.1.0"
helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1"
kube-version/minor: "18"
Expand All @@ -81,4 +81,4 @@ spec:
protocol: TCP
name: apache
selector:
app.kubernetes.io/name: subchart1
app.kubernetes.io/name: subchart
12 changes: 6 additions & 6 deletions cmd/helm/testdata/output/template-show-only-glob.txt
View file
Open in desktop
@@ -1,23 +1,23 @@
---
# Source: subchart1/templates/subdir/role.yaml
# Source: subchart/templates/subdir/role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: subchart1-role
name: subchart-role
rules:
- resources: ["*"]
verbs: ["get","list","watch"]
---
# Source: subchart1/templates/subdir/rolebinding.yaml
# Source: subchart/templates/subdir/rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: subchart1-binding
name: subchart-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: subchart1-role
name: subchart-role
subjects:
- kind: ServiceAccount
name: subchart1-sa
name: subchart-sa
namespace: default
10 changes: 5 additions & 5 deletions cmd/helm/testdata/output/template-show-only-multiple.txt
View file
Open in desktop
@@ -1,11 +1,11 @@
---
# Source: subchart1/templates/service.yaml
# Source: subchart/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
name: subchart1
name: subchart
labels:
helm.sh/chart: "subchart1-0.1.0"
helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1"
kube-version/minor: "18"
Expand All @@ -19,9 +19,9 @@ spec:
protocol: TCP
name: nginx
selector:
app.kubernetes.io/name: subchart1
app.kubernetes.io/name: subchart
---
# Source: subchart1/charts/subcharta/templates/service.yaml
# Source: subchart/charts/subcharta/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
Expand Down
8 changes: 4 additions & 4 deletions cmd/helm/testdata/output/template-show-only-one.txt
View file
Open in desktop
@@ -1,11 +1,11 @@
---
# Source: subchart1/templates/service.yaml
# Source: subchart/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
name: subchart1
name: subchart
labels:
helm.sh/chart: "subchart1-0.1.0"
helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1"
kube-version/minor: "18"
Expand All @@ -19,4 +19,4 @@ spec:
protocol: TCP
name: nginx
selector:
app.kubernetes.io/name: subchart1
app.kubernetes.io/name: subchart
28 changes: 14 additions & 14 deletions cmd/helm/testdata/output/template-values-files.txt
View file
Open in desktop
@@ -1,34 +1,34 @@
---
# Source: subchart1/templates/subdir/serviceaccount.yaml
# Source: subchart/templates/subdir/serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: subchart1-sa
name: subchart-sa
---
# Source: subchart1/templates/subdir/role.yaml
# Source: subchart/templates/subdir/role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: subchart1-role
name: subchart-role
rules:
- resources: ["*"]
verbs: ["get","list","watch"]
---
# Source: subchart1/templates/subdir/rolebinding.yaml
# Source: subchart/templates/subdir/rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: subchart1-binding
name: subchart-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: subchart1-role
name: subchart-role
subjects:
- kind: ServiceAccount
name: subchart1-sa
name: subchart-sa
namespace: default
---
# Source: subchart1/charts/subcharta/templates/service.yaml
# Source: subchart/charts/subcharta/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
Expand All @@ -45,7 +45,7 @@ spec:
selector:
app.kubernetes.io/name: subcharta
---
# Source: subchart1/charts/subchartb/templates/service.yaml
# Source: subchart/charts/subchartb/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
Expand All @@ -62,13 +62,13 @@ spec:
selector:
app.kubernetes.io/name: subchartb
---
# Source: subchart1/templates/service.yaml
# Source: subchart/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
name: subchart1
name: subchart
labels:
helm.sh/chart: "subchart1-0.1.0"
helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1"
kube-version/minor: "18"
Expand All @@ -81,4 +81,4 @@ spec:
protocol: TCP
name: apache
selector:
app.kubernetes.io/name: subchart1
app.kubernetes.io/name: subchart
28 changes: 14 additions & 14 deletions cmd/helm/testdata/output/template-with-api-version.txt
View file
Open in desktop
@@ -1,34 +1,34 @@
---
# Source: subchart1/templates/subdir/serviceaccount.yaml
# Source: subchart/templates/subdir/serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: subchart1-sa
name: subchart-sa
---
# Source: subchart1/templates/subdir/role.yaml
# Source: subchart/templates/subdir/role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: subchart1-role
name: subchart-role
rules:
- resources: ["*"]
verbs: ["get","list","watch"]
---
# Source: subchart1/templates/subdir/rolebinding.yaml
# Source: subchart/templates/subdir/rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: subchart1-binding
name: subchart-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: subchart1-role
name: subchart-role
subjects:
- kind: ServiceAccount
name: subchart1-sa
name: subchart-sa
namespace: default
---
# Source: subchart1/charts/subcharta/templates/service.yaml
# Source: subchart/charts/subcharta/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
Expand All @@ -45,7 +45,7 @@ spec:
selector:
app.kubernetes.io/name: subcharta
---
# Source: subchart1/charts/subchartb/templates/service.yaml
# Source: subchart/charts/subchartb/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
Expand All @@ -62,13 +62,13 @@ spec:
selector:
app.kubernetes.io/name: subchartb
---
# Source: subchart1/templates/service.yaml
# Source: subchart/templates/service.yaml
apiVersion: v1
kind: Service
metadata:
name: subchart1
name: subchart
labels:
helm.sh/chart: "subchart1-0.1.0"
helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1"
kube-version/minor: "18"
Expand All @@ -82,4 +82,4 @@ spec:
protocol: TCP
name: nginx
selector:
app.kubernetes.io/name: subchart1
app.kubernetes.io/name: subchart