BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #226277 from vcunat/p/grafana-tests

Browse source 
grafana: fix a test by upstream patch, instead of skipping it
This commit is contained in:
Maximilian Bosch 2023-04-26 19:57:51 +02:00 committed by GitHub
commit 1bace74c76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/servers/monitoring/grafana/default.nix
View file

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: { lib, buildGoModule, fetchurl, fetchFromGitHub, fetchpatch, nixosTests, tzdata, wire }:
buildGoModule rec { buildGoModule rec {
pname = "grafana"; pname = "grafana";
@ -18,6 +18,14 @@ buildGoModule rec {
sha256 = "sha256-HiKr1ier13xUlrwsJrxo60wwqmiPcza2oOLIfMgFWc0="; sha256 = "sha256-HiKr1ier13xUlrwsJrxo60wwqmiPcza2oOLIfMgFWc0=";
}; };
patches = [
(fetchpatch { # https://github.com/grafana/grafana/pull/65790
name = "fix-TestIntegrationAMConfigAccess.patch";
url = "https://github.com/grafana/grafana/commit/8500eb1c180b4d49a8e17bfd6df675d821d038a4.diff";
sha256 = "sha256-TWPn9fLjmCbXGXkxAc3NLTN+0XXjsaspaV4gYKg3+Mk=";
})
];
vendorSha256 = "sha256-sUvjZTg2/6UGjc2Qv8YO4IWlS4Y/FzGRVOQ9I/wp/aM="; vendorSha256 = "sha256-sUvjZTg2/6UGjc2Qv8YO4IWlS4Y/FzGRVOQ9I/wp/aM=";
nativeBuildInputs = [ wire ]; nativeBuildInputs = [ wire ];
@ -48,9 +56,6 @@ buildGoModule rec {
sed -i -e '/it should change folder successfully and return correct result/{N;s/$/\nt.Skip();/}'\ sed -i -e '/it should change folder successfully and return correct result/{N;s/$/\nt.Skip();/}'\
pkg/services/libraryelements/libraryelements_patch_test.go pkg/services/libraryelements/libraryelements_patch_test.go
# TODO: investigate?
substituteInPlace pkg/tests/api/alerting/api_alertmanager_test.go \
--replace TestIntegrationAMConfigAccess DontTestIntegrationAMConfigAccess
# main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
rm -r scripts/go rm -r scripts/go