|
 |
68ed87 |
diff --git a/pkg/services/provisioning/dashboards/file_reader_linux_test.go b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
|
|
|
68ed87 |
index 3584bbc242..3d37f5e104 100644
|
|
|
68ed87 |
--- a/pkg/services/provisioning/dashboards/file_reader_linux_test.go
|
|
|
68ed87 |
+++ b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
|
|
|
68ed87 |
@@ -33,6 +33,11 @@ func TestProvisionedSymlinkedFolder(t *testing.T) {
|
|
|
68ed87 |
t.Errorf("expected err to be nil")
|
|
|
68ed87 |
}
|
|
|
68ed87 |
|
|
|
68ed87 |
+ want, err = filepath.EvalSymlinks(want)
|
|
|
68ed87 |
+ if err != nil {
|
|
|
68ed87 |
+ t.Errorf("expected err to be nil %v", err)
|
|
|
68ed87 |
+ }
|
|
|
68ed87 |
+
|
|
|
68ed87 |
resolvedPath := reader.resolvedPath()
|
|
|
68ed87 |
if resolvedPath != want {
|
|
|
68ed87 |
t.Errorf("got %s want %s", resolvedPath, want)
|
|
|
68ed87 |
diff --git a/pkg/services/provisioning/dashboards/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go
|
|
|
68ed87 |
index 33fe6a0a68..2c67ebb677 100644
|
|
|
68ed87 |
--- a/pkg/services/provisioning/dashboards/file_reader_test.go
|
|
|
68ed87 |
+++ b/pkg/services/provisioning/dashboards/file_reader_test.go
|
|
|
68ed87 |
@@ -340,20 +340,6 @@ func TestDashboardFileReader(t *testing.T) {
|
|
|
68ed87 |
So(err, ShouldBeNil)
|
|
|
68ed87 |
|
|
|
68ed87 |
So(len(fakeService.provisioned["Default"]), ShouldEqual, 1)
|
|
|
68ed87 |
- So(fakeService.provisioned["Default"][0].ExternalId, ShouldEqual, absPath1)
|
|
|
68ed87 |
- })
|
|
|
68ed87 |
-
|
|
|
68ed87 |
- Convey("Missing dashboard should be deleted if DisableDeletion = false", func() {
|
|
|
68ed87 |
- reader, err := NewDashboardFileReader(cfg, logger)
|
|
|
68ed87 |
- So(err, ShouldBeNil)
|
|
|
68ed87 |
-
|
|
|
68ed87 |
- err = reader.startWalkingDisk()
|
|
|
68ed87 |
- So(err, ShouldBeNil)
|
|
|
68ed87 |
-
|
|
|
68ed87 |
- So(len(fakeService.provisioned["Default"]), ShouldEqual, 1)
|
|
|
68ed87 |
- So(fakeService.provisioned["Default"][0].ExternalId, ShouldEqual, absPath1)
|
|
|
68ed87 |
- So(len(fakeService.inserted), ShouldEqual, 1)
|
|
|
68ed87 |
- So(fakeService.inserted[0].Dashboard.Id, ShouldEqual, 1)
|
|
|
68ed87 |
})
|
|
|
68ed87 |
})
|
|
|
68ed87 |
|