Blame SOURCES/003-fix-dashboard-abspath-test.patch
|
 |
3d91f6 |
diff --git a/pkg/services/provisioning/dashboards/file_reader_linux_test.go b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
|
|
|
3d91f6 |
index 3584bbc242..1a89767b69 100644
|
|
|
3d91f6 |
--- a/pkg/services/provisioning/dashboards/file_reader_linux_test.go
|
|
|
3d91f6 |
+++ b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
|
|
|
3d91f6 |
@@ -28,6 +28,7 @@ func TestProvisionedSymlinkedFolder(t *testing.T) {
|
|
|
3d91f6 |
}
|
|
|
3d91f6 |
|
|
|
3d91f6 |
want, err := filepath.Abs(containingID)
|
|
|
3d91f6 |
+ want, err = filepath.EvalSymlinks(want)
|
|
|
3d91f6 |
|
|
|
3d91f6 |
if err != nil {
|
|
|
3d91f6 |
t.Errorf("expected err to be nil")
|
|
|
3d91f6 |
diff --git a/pkg/services/provisioning/dashboards/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go
|
|
|
3d91f6 |
index 946d487d5f..2acef40eed 100644
|
|
|
3d91f6 |
--- a/pkg/services/provisioning/dashboards/file_reader_test.go
|
|
|
3d91f6 |
+++ b/pkg/services/provisioning/dashboards/file_reader_test.go
|
|
|
3d91f6 |
@@ -318,6 +318,7 @@ func TestDashboardFileReader(t *testing.T) {
|
|
|
3d91f6 |
}
|
|
|
3d91f6 |
|
|
|
3d91f6 |
absPath1, err := filepath.Abs(unprovision + "/dashboard1.json")
|
|
|
3d91f6 |
+ absPath1, err = filepath.EvalSymlinks(absPath1)
|
|
|
3d91f6 |
So(err, ShouldBeNil)
|
|
|
3d91f6 |
// This one does not exist on disk, simulating a deleted file
|
|
|
3d91f6 |
absPath2, err := filepath.Abs(unprovision + "/dashboard2.json")
|