Unverified Commit 1bace74c authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

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

grafana: fix a test by upstream patch, instead of skipping it
parents 7a0e2484 f3ec1208

pkgs/servers/monitoring/grafana/default.nix

+9 −4
Original line number Diff line number Diff line 
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:

{ lib, buildGoModule, fetchurl, fetchFromGitHub, fetchpatch, nixosTests, tzdata, wire }:



buildGoModule rec {

  pname = "grafana";
@@ -18,6 +18,14 @@ buildGoModule rec { 
    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=";



  nativeBuildInputs = [ wire ];
@@ -48,9 +56,6 @@ buildGoModule rec { 
    sed -i -e '/it should change folder successfully and return correct result/{N;s/$/\nt.Skip();/}'\

      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

    rm -r scripts/go