ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #1361 from Ma27/fix-gitea-test

Browse Source 
flake: fix gitea integration test
This commit is contained in:
ajs124 2024-03-08 15:28:07 +01:00 committed by GitHub
commit 8f56209bd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flake.nix
View File

@ -180,13 +180,9 @@
root=d7f16a3412e01a43a414535b16007c6931d3a9c7 root=d7f16a3412e01a43a414535b16007c6931d3a9c7
</gitea_authorization> </gitea_authorization>
''; '';
nixpkgs.config.permittedInsecurePackages = [ "gitea-1.19.4" ];
nix = { nix = {
distributedBuilds = true; settings.substituters = [ ];
buildMachines = [{
hostName = "localhost";
systems = [ system ];
}];
binaryCaches = [ ];
}; };
services.gitea = { services.gitea = {
enable = true; enable = true;
@ -202,7 +198,7 @@
testScript = testScript =
let let
scripts.mktoken = pkgs.writeText "token.sql" '' scripts.mktoken = pkgs.writeText "token.sql" ''
INSERT INTO access_token (id, uid, name, created_unix, updated_unix, token_hash, token_salt, token_last_eight) VALUES (1, 1, 'hydra', 1617107360, 1617107360, 'a930f319ca362d7b49a4040ac0af74521c3a3c3303a86f327b01994430672d33b6ec53e4ea774253208686c712495e12a486', 'XRjWE9YW0g', '31d3a9c7'); INSERT INTO access_token (id, uid, name, created_unix, updated_unix, token_hash, token_salt, token_last_eight, scope) VALUES (1, 1, 'hydra', 1617107360, 1617107360, 'a930f319ca362d7b49a4040ac0af74521c3a3c3303a86f327b01994430672d33b6ec53e4ea774253208686c712495e12a486', 'XRjWE9YW0g', '31d3a9c7', 'all');
''; '';
scripts.git-setup = pkgs.writeShellScript "setup.sh" '' scripts.git-setup = pkgs.writeShellScript "setup.sh" ''
@ -357,9 +353,9 @@
response = json.loads(data) response = json.loads(data)
assert len(response) == 2, "Expected exactly two status updates for latest commit!" assert len(response) == 2, "Expected exactly three status updates for latest commit (queued, finished)!"
assert response[0]['status'] == "success", "Expected latest status to be success!" assert response[0]['status'] == "success", "Expected finished status to be success!"
assert response[1]['status'] == "pending", "Expected first status to be pending!" assert response[1]['status'] == "pending", "Expected queued status to be pending!"
machine.shutdown() machine.shutdown()
''; '';

4
src/lib/Hydra/Plugin/GiteaStatus.pm
View File

@ -88,10 +88,6 @@ sub buildQueued {
common(@_, [], 0); common(@_, [], 0);
} }
sub buildStarted {
common(@_, [], 1);
}
sub buildFinished { sub buildFinished {
common(@_, 2); common(@_, 2);
} }