From a316f8b9105d740822136c3873ade9539320d419 Mon Sep 17 00:00:00 2001 From: dettlaff <dettlaff@riseup.net> Date: Mon, 7 Aug 2023 16:56:35 +0400 Subject: [PATCH] tests: fix --- dump.rdb | Bin 476 -> 633 bytes .../graphql/mutations/system_mutations.py | 6 +++--- .../test_graphql/test_nix_collect_garbage.py | 20 ++++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dump.rdb b/dump.rdb index 5198f51641b5291db4f7760ebe55b3f31fe30e47..ddf1da50f459311aab5195b1e1cc6dc3c2cc6d4f 100644 GIT binary patch literal 633 zcmcJM&u-H|5XLuZ98#c?B~Bor2Cm5Q+9XZu0}2vFsstRM;#h0!orIO`U2As}lv`Eh zz`uv!9e9DLPXGt5T#-0(G>EWPVu=^vw)>4{<~QH>{P@wy3rYi8?J8tkdvjEsQJ?mM zpt`zI5^nTrTsf)X1zvvn{+U(XnMURnSX`d}bV=0(Iq?$ExFUbZuTIO|D<s1_)<!Cr z;{HA%q)nCr3UrnRwQ-gVjD0_o0-ZIvkwBWw$|#p9*e*;Jn%h%_V0s`}&qxD#zUXO~ zU~g0X{WS8wzHJfW-rDr)NDC<SD`|9;21i4HWH>%Mvx__Ag0r1Bjkx<kqnh&+;~Ho0 zeT}nKuD`R3Ef<TyT>BW(@V-Y6JvurK!f0?1g-89tFdU5z?@=02dS~t4ZFc9NjWr<6 ztSk18e`fw~26D4u;DVc)eS3_KR;{+%6iX%NoS|~Mwa11_F@EW*nec6p$`2@|ez~Zz zJ)0!MN%IT+T8s-h$2hUAnU1$3V=l@ZsJ{(oCKTqickPS|)_#2Q<aj5;1#xmY<$_#M TSjw0)vi>yqar)r(!*729Vh!Ax delta 437 zcmZwC%}x_R902fLp;EAhqQ-!Q>|Bg`*k*U9-IiXE@DaH*BzW<(PG|ltgWZ|U%xuD* z+Q>HzfwLau;K^t3VDRoy661jf@C8I8ayCA|@9_IM{C()e@6nAf>@uHfU~UZY*=am( zUFL~wyDg&Oll8~?W!t}BoWK5YU|Ux4$%bs{M#uujT9~*sV1ZkywCgUJWxflvO534d z0gUUP=a=R)C%Z<I)>g{d@caKMr}wXWxM#8iBF^&fV#0-SKoCKpOl7wV)I@@BMjfJB zqyuPMkQi>{ju-k5EOdI`DGnHDs(50!6ot17T_A#s4oVZ0itA#Ip@h&^Xzre#-qnVf zRQE>qmsgrAYtNPzM+g0hvB<!tDV#K=S%2CXG7?d=?5K(TM9Gc<tw))CNEHwREF$LC zo4^aOJLT0~4?p*+jbOInRmvg8p<gQ<rU|>a^Ju(U_Wc0Y!qTA41=s5@SFOUu*lPcA uv5w279Z*WDo7+t(Ah(N-Zl_%{a=eyl12N*d|G_R^U1c*L?=F7*7XAhG<dS9p diff --git a/selfprivacy_api/graphql/mutations/system_mutations.py b/selfprivacy_api/graphql/mutations/system_mutations.py index c483168..aea3bd5 100644 --- a/selfprivacy_api/graphql/mutations/system_mutations.py +++ b/selfprivacy_api/graphql/mutations/system_mutations.py @@ -6,7 +6,7 @@ from selfprivacy_api.graphql import IsAuthenticated from selfprivacy_api.graphql.mutations.mutation_interface import ( GenericMutationReturn, MutationReturnInterface, - GenericJobButationReturn, + GenericJobMutationReturn, ) import selfprivacy_api.actions.system as system_actions @@ -131,10 +131,10 @@ class SystemMutations: ) @strawberry.mutation(permission_classes=[IsAuthenticated]) - def nix_collect_garbage(self) -> GenericJobButationReturn: + def nix_collect_garbage(self) -> GenericJobMutationReturn: job = start_nix_collect_garbage() - return GenericJobButationReturn( + return GenericJobMutationReturn( success=True, code=200, message="Cleaning started..,", diff --git a/tests/test_graphql/test_nix_collect_garbage.py b/tests/test_graphql/test_nix_collect_garbage.py index 900014a..703dbed 100644 --- a/tests/test_graphql/test_nix_collect_garbage.py +++ b/tests/test_graphql/test_nix_collect_garbage.py @@ -113,11 +113,13 @@ def test_get_dead_packages_zero(job_reset): RUN_NIX_COLLECT_GARBAGE_QUERY = """ -mutation system { - nixCollectGarbage { - success - message - code +mutation CollectGarbage { + system { + nixCollectGarbage { + success + message + code + } } } """ @@ -133,7 +135,7 @@ def test_graphql_nix_collect_garbage(authorized_client): assert response.status_code == 200 assert response.json().get("data") is not None - assert response.json()["data"]["nixCollectGarbage"]["success"] is True - assert response.json()["data"]["nixCollectGarbage"]["message"] is not None - assert response.json()["data"]["nixCollectGarbage"]["code"] == 200 - assert response.json()["data"]["nixCollectGarbage"]["success"] == True + assert response.json()["data"]["system"]["nixCollectGarbage"]["success"] is True + assert response.json()["data"]["system"]["nixCollectGarbage"]["message"] is not None + assert response.json()["data"]["system"]["nixCollectGarbage"]["success"] == True + assert response.json()["data"]["system"]["nixCollectGarbage"]["code"] == 200