Skip to content

Commit

Permalink
Isolating dashboard tests to see if these are the last items to fix
Browse files Browse the repository at this point in the history
  • Loading branch information
casibbald committed Nov 25, 2024
1 parent 7fd1e72 commit 230379f
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions pkg/run/install/install_dashboard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ var _ = Describe("InstallDashboard", func() {
var _ = Describe("GetInstalledDashboard", func() {
var (
fakeContext context.Context
//fakeClientWithHelmReleases client.WithWatch
// fakeClientWithHelmReleases client.WithWatch
fakeClientWithDeployments client.WithWatch
blankClient client.WithWatch
errorClient ErroringFakeClient
Expand All @@ -206,39 +206,39 @@ var _ = Describe("GetInstalledDashboard", func() {
scheme, err := kube.CreateScheme()
Expect(err).NotTo(HaveOccurred())

//fakeClientWithHelmReleases = fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(helmReleaseFixtures...).Build()
// fakeClientWithHelmReleases = fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(helmReleaseFixtures...).Build()
fakeClientWithDeployments = fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(deploymentFixtures...).Build()
blankClient = fake.NewClientBuilder().WithScheme(scheme).Build()
errorClient = ErroringFakeClient{}
})

//It("returns the oss dashboard type if the dashboard is installed with a helmrelease", func() {
// dashboardType, dashboardName, err := GetInstalledDashboard(fakeContext, fakeClientWithHelmReleases, testNamespace, map[DashboardType]bool{
// It("returns the oss dashboard type if the dashboard is installed with a helmrelease", func() {
// dashboardType, dashboardName, err := GetInstalledDashboard(fakeContext, fakeClientWithHelmReleases, testNamespace, map[DashboardType]bool{
// DashboardTypeOSS: true,
// })
// Expect(err).ToNot(HaveOccurred())
// Expect(dashboardType).To(Equal(DashboardTypeOSS))
// Expect(dashboardName).To(Equal("dashboard-2"))
//})
// })
//
//It("returns the enterprise dashboard type if the dashboard is installed with a helmrelease", func() {
// dashboardType, dashboardName, err := GetInstalledDashboard(fakeContext, fakeClientWithHelmReleases, testNamespace, map[DashboardType]bool{
// It("returns the enterprise dashboard type if the dashboard is installed with a helmrelease", func() {
// dashboardType, dashboardName, err := GetInstalledDashboard(fakeContext, fakeClientWithHelmReleases, testNamespace, map[DashboardType]bool{
// DashboardTypeEnterprise: true,
// })
// Expect(err).ToNot(HaveOccurred())
// Expect(dashboardType).To(Equal(DashboardTypeEnterprise))
// Expect(dashboardName).To(Equal("dashboard-3"))
//})
// })
//
//It("returns the enterprise dashboard type if both dashboards are installed with a helmrelease", func() {
// dashboardType, dashboardName, err := GetInstalledDashboard(fakeContext, fakeClientWithHelmReleases, testNamespace, map[DashboardType]bool{
// It("returns the enterprise dashboard type if both dashboards are installed with a helmrelease", func() {
// dashboardType, dashboardName, err := GetInstalledDashboard(fakeContext, fakeClientWithHelmReleases, testNamespace, map[DashboardType]bool{
// DashboardTypeOSS: true,
// DashboardTypeEnterprise: true,
// })
// Expect(err).ToNot(HaveOccurred())
// Expect(dashboardType).To(Equal(DashboardTypeEnterprise))
// Expect(dashboardName).To(Equal("dashboard-3"))
//})
// })

It("returns the oss dashboard type if the dashboard is installed with a deployment only", func() {
dashboardType, dashboardName, err := GetInstalledDashboard(fakeContext, fakeClientWithDeployments, testNamespace, map[DashboardType]bool{
Expand Down

0 comments on commit 230379f

Please sign in to comment.