From 4401d4ccaa21f0a92ac5e7ee3f876d4ff8b170ab Mon Sep 17 00:00:00 2001 From: Dina Graves Portman Date: Tue, 30 Mar 2021 10:38:11 -0700 Subject: [PATCH 1/3] test: fix flaky test Quick fix to use retries to fix flaky test. Test file should probably be re-written though using fixtures and other best practices. --- samples/snippets/samples_test.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/samples/snippets/samples_test.py b/samples/snippets/samples_test.py index 7145dd7..9410b6c 100644 --- a/samples/snippets/samples_test.py +++ b/samples/snippets/samples_test.py @@ -187,7 +187,7 @@ def test_pubsub(self): # clean up client.delete_subscription({"subscription": subscription_name}) - def test_poll_discovery_occurrence(self): + def test_poll_discovery_occurrence_fails(self): # try with no discovery occurrence try: samples.poll_discovery_finished(self.image_url, 5, PROJECT_ID) @@ -196,7 +196,9 @@ def test_poll_discovery_occurrence(self): else: # we expect timeout error assert False - + + @pytest.mark.flaky(max_runs=3, min_passes=1) + def test_poll_discovery_occurrence(self): # create discovery occurrence note_id = 'discovery-note-{}'.format(uuid.uuid4()) client = containeranalysis_v1.ContainerAnalysisClient() @@ -220,7 +222,6 @@ def test_poll_discovery_occurrence(self): create_occurrence(parent=f"projects/{PROJECT_ID}", occurrence=occurrence) - # poll again disc = samples.poll_discovery_finished(self.image_url, 10, PROJECT_ID) status = disc.discovery.analysis_status assert disc is not None From d8d93c12c81f7a0ebb96e5ff4cdeb40798f3cab4 Mon Sep 17 00:00:00 2001 From: Dina Graves Portman Date: Tue, 30 Mar 2021 10:44:10 -0700 Subject: [PATCH 2/3] test: removing extra whitespace --- ...acbookpro3.roam.corp.google.com.70650.781531 | Bin 0 -> 53248 bytes ...acbookpro3.roam.corp.google.com.70665.957167 | Bin 0 -> 53248 bytes samples/snippets/samples_test.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .coverage.dinagraves-macbookpro3.roam.corp.google.com.70650.781531 create mode 100644 .coverage.dinagraves-macbookpro3.roam.corp.google.com.70665.957167 diff --git a/.coverage.dinagraves-macbookpro3.roam.corp.google.com.70650.781531 b/.coverage.dinagraves-macbookpro3.roam.corp.google.com.70650.781531 new file mode 100644 index 0000000000000000000000000000000000000000..ab19680937080007f925fab96ba877687b42a785 GIT binary patch literal 53248 zcmeI)O>Y}T7zc1~?AmeSXp5rA3Q@>hz>R8Wvq}2O0RrSuQ3+ZCLPFq<*JFE|^{%tK zb`m6n+#>Y@An^?l-={||T=@XpxbQst65CB&l~YyszlxoGnVFsW%`>x(ciXQX+_ys| zTAtsPq1eq_&1hQYV<9q`Op#to^h%ckt>n@T`mK$vPg^Z!w)Vu5{!ONo|1G2cu=K57 zEB(G?EdE&<6n|a(qwu)s&;cwEfB*y_0D(wg_@GoMudZrOehOv7QK2s_<;U+!pFTX; zKRghJ`=8uD5b-{7Z9&jdtBHN#dncl&e9^KUC2Y58TQaoWwg@{aP2CSvldpKRkFI%~ za4X8sYjwLxxkA;ZB6_~vmHwGHQfJjDL2|ZGorduaDn!|Bms5yqN%l?QtCsSWYpEcv z#WlORxv=^4=Y>Lfd0Bg=qBcq2qMyZy*3gboQ|`5>Aj|WcT>FMEU8|#ls*vX`v^=Wk zX&ATG_qs;t3CDJ$X1akL+MX-asj~W^YF^sFDx;+f;f=S3%6h~NdKBkO&NZep%6v)A zBzcm#MU`{Cly#JmPfeMlI=lUDgUBEEyFKn4$`PM9^rq#UmN)d0#=dgjT+)}L_D*zX zO3pnR=jyxmabKNxepQTeR-(JtcJb`1H8pQ8F1MJc=Agc&%v2aBdNI z4n_0$m@!fe>GMDnUXqY%`dXunD@%0{4aaLt##$6HfuaFIb3vM{)pso(Dgn2_@&?M6 zZMBsgji-gz9Y_>9W-(tr*q9bN=OIux&sP_QtNB8CZB2VpjKV1Ct>jl>B81YOykr_p z4|SCc`hGf*ylj$8bBt!mbc`fNs5!MlzP!IStvN}$x|yuZ4-2_Md1XZ##v_8~C4OC* zXaw&W4S^Rf1g~EGo(wzUV%>Q+RlIT~U;c1qTE)2vb(7!oPan=jRen~8^t&|a^D8@1 zW!^KY^5^QTHjoa@COv8UG-PQGj;{cM6E-C!mJP2TM)Av=QF!vTXH?&~fYEkpPpLMe z;F&z)2^`JMkt zp63rT!ws!azJ6UB_LDIfPcQX=uH{{sRy*08n~04U4vxa)3z}!?L(X`3u-zC3Z^mcf zIW6wNMy!ygN z%$?fyZDHQHYu>rLb8BfXySAL%WxuhtJA6;etv@l-$0NS07+(kURD(ee^~ts`2P!by zp4WC%&2qecvlcXu499LHJEMKPiyi}120dBe+g4EbRnPN7<6{(!-QM2b+r4cXhep`#odiAA@A!kt_Y2ggIsJJ? zf3E+d|E>S^)^;%(4gm;200Izz00bZa0SG_<0uXqk1WMU;E&Zw@H=kY6_?wFCVs=eS zzLuC<%&r&HZzQ6B;D7avY9J~L0SG_<0uX=z1Rwwb2tWV=5P-n{6yW>+^q>A=fdB*` z009U<00Izz00bZa0SG`~h6Ql{e}+33O@jagAOHafKmY;|fB*y_009Uj0=WN=P=Ejg zAOHafKmY;|fB*y_009Whz5wq3&wd}Hg%E%M1Rwwb2tWV=5P$##AOHc}|3?f!00Izz z00bZa0SG_<0uX=z1ZH0V_y1?VkI_O1KmY;|fB*y_009U<00Izz0Pg=I1|R?d2tWV= r5P$##AOHafKmY=>FM#|1v){*PAp{@*0SG_<0uX=z1Rwwb2teRJmcw2M literal 0 HcmV?d00001 diff --git a/.coverage.dinagraves-macbookpro3.roam.corp.google.com.70665.957167 b/.coverage.dinagraves-macbookpro3.roam.corp.google.com.70665.957167 new file mode 100644 index 0000000000000000000000000000000000000000..9a3bbea127e06c87b45d11c915a1826b71b94ad6 GIT binary patch literal 53248 zcmeI)O>Y}T7zc1~?AmeSXp5rADpAN>z>R8W<0LIjIY59MDk?!sKu8GO@$T5(c3+&` zb(&N{$SqPo021E-@qK#a!j%uejSJ7SFR|UkRXJ64|Et*9mzmj_-#jzxc(?uf?j1W) zqT>gyjKogva!%87p9qo5<;wJ0qF1(*Xr+*C&~I&QecEa{x4A2p^lx*O;%_Xj?nlb<5lc2pEdQw7QU(r5P$ z_74xl;r^$04n(p~TwM^fG#X-G1pXt@SApo*juN(K*`|zauPdUS%2E$PW$_h{_R%$u z6K=-&d97tzlq*tQDxx3Qt_)7aLv>n@6QpO0)Jc@=phA@0^*DvNnr7b+f$FG0d8P`J zT3ofQjfIV;KQEN3%gfp`6}L$SCjBfq4Hj(DbRE zCsEScz;}(v7mn@4&GbS$vVBje6J-t}WnI|7I-_L^;f=S3%DT@Dx}W4s&o!nq%6vi2 zG*-Zl61cawI2?{AoF-<&FHbv9H`W7xd+*y%XJ; zk#mnGxdxtnG*D-qUl*gC^|%?HUl-g6ih%bQi`BhlEk{wQPQoLHK6tg{AoAnw7Il8B zNpF>3-kC2|*VnaYM{%GqPpfT5;n_-gB52NbPYE49K0R)DluQN*k0QqrekUF>oLeNF zL(x1wW{eC&20YM&pC+W5zSd~t%2FLf+wt3zu@*;6sAz!DT#zN}3_O#EO2}<6{bLo# zuG&nGCey;}4kQYlX1Q2BSf3U;XCcsPo~9@oY0b#ShoE^6vr=b#^K4=o>6_10!G`JJ*C=+ zlhg2~6NR_34N>dKkSCw8CfdI5DCs4a1WI^2q*K|Uh);d~V)XH-jPR7p=pNVNs$|y` zp4|^=tYyQBR$NzlR(hG@t8Y>&P5C?~`8>(oK^aAj#$re#^Mx|ALerx>QDx?9-4$?80OfRjFuH~-Gs-14mO~l3v2S;J@CC#(+A!j^1*lvu2H0jx)w1Nc!5P$##AOHafKmY;|fB*y_@YV`c3i&lXdrqSHZa%-V!_Nt9Z*6Zi zn%j-7o1%IBR&(#x_Kl^v{OWRgm;L(Y&hS00u=b>xJs$CW&G;syry2};s84nSd8|UC z>-$|tHB84JSdGwnXgGE|-5KxWUGx~BGU&;Iz&68Hp!$9gseqn#sMSTyIF^CY@g0lH z^&T40cJIbX&$Di9xA%5F>^<(8P3QDz_vY5t?#|7oacD$t|9WT7eH`prwI3F!PYe3< zoc>(@NB>*@>#gl#G#mmDfB*y_009U<00Izz00bcLMhR5%Yg+bIMPWX_qVYEs`NjOI zmVPZUx0qimXWvM~|G@w98`VHm76K4}00bZa0SG_<0uX=z1Rwx`|0%%t|LH&d!vX;a zKmY;|fB*y_009U<00IzzzzhrE{{IYjE}8}b2tWV=5P$##AOHafKmY;|NCj~JAE5vN z2tWV=5P$##AOHafKmY;|n0*1<|DXLnMhhVT0SG_<0uX=z1Rwwb2tWV=xc`qBfB*y_ z009U<00Izz00bZa0SL^#0Pg?KejlTS5P$##AOHafKmY;|fB*y_00G?pM+`s!0uX=z s1Rwwb2tWV=5P$##W?umJ|7X9C(LxA700Izz00bZa0SG_<0uX?}f2rhMO#lD@ literal 0 HcmV?d00001 diff --git a/samples/snippets/samples_test.py b/samples/snippets/samples_test.py index 9410b6c..dd9bce6 100644 --- a/samples/snippets/samples_test.py +++ b/samples/snippets/samples_test.py @@ -196,7 +196,7 @@ def test_poll_discovery_occurrence_fails(self): else: # we expect timeout error assert False - + @pytest.mark.flaky(max_runs=3, min_passes=1) def test_poll_discovery_occurrence(self): # create discovery occurrence From 23f072a6ce110cc6d8e4a7ed308ec6c3d22f6263 Mon Sep 17 00:00:00 2001 From: Dina Graves Portman Date: Tue, 30 Mar 2021 10:57:51 -0700 Subject: [PATCH 3/3] fix: removing local files --- ...acbookpro3.roam.corp.google.com.70650.781531 | Bin 53248 -> 0 bytes ...acbookpro3.roam.corp.google.com.70665.957167 | Bin 53248 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .coverage.dinagraves-macbookpro3.roam.corp.google.com.70650.781531 delete mode 100644 .coverage.dinagraves-macbookpro3.roam.corp.google.com.70665.957167 diff --git a/.coverage.dinagraves-macbookpro3.roam.corp.google.com.70650.781531 b/.coverage.dinagraves-macbookpro3.roam.corp.google.com.70650.781531 deleted file mode 100644 index ab19680937080007f925fab96ba877687b42a785..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53248 zcmeI)O>Y}T7zc1~?AmeSXp5rA3Q@>hz>R8Wvq}2O0RrSuQ3+ZCLPFq<*JFE|^{%tK zb`m6n+#>Y@An^?l-={||T=@XpxbQst65CB&l~YyszlxoGnVFsW%`>x(ciXQX+_ys| zTAtsPq1eq_&1hQYV<9q`Op#to^h%ckt>n@T`mK$vPg^Z!w)Vu5{!ONo|1G2cu=K57 zEB(G?EdE&<6n|a(qwu)s&;cwEfB*y_0D(wg_@GoMudZrOehOv7QK2s_<;U+!pFTX; zKRghJ`=8uD5b-{7Z9&jdtBHN#dncl&e9^KUC2Y58TQaoWwg@{aP2CSvldpKRkFI%~ za4X8sYjwLxxkA;ZB6_~vmHwGHQfJjDL2|ZGorduaDn!|Bms5yqN%l?QtCsSWYpEcv z#WlORxv=^4=Y>Lfd0Bg=qBcq2qMyZy*3gboQ|`5>Aj|WcT>FMEU8|#ls*vX`v^=Wk zX&ATG_qs;t3CDJ$X1akL+MX-asj~W^YF^sFDx;+f;f=S3%6h~NdKBkO&NZep%6v)A zBzcm#MU`{Cly#JmPfeMlI=lUDgUBEEyFKn4$`PM9^rq#UmN)d0#=dgjT+)}L_D*zX zO3pnR=jyxmabKNxepQTeR-(JtcJb`1H8pQ8F1MJc=Agc&%v2aBdNI z4n_0$m@!fe>GMDnUXqY%`dXunD@%0{4aaLt##$6HfuaFIb3vM{)pso(Dgn2_@&?M6 zZMBsgji-gz9Y_>9W-(tr*q9bN=OIux&sP_QtNB8CZB2VpjKV1Ct>jl>B81YOykr_p z4|SCc`hGf*ylj$8bBt!mbc`fNs5!MlzP!IStvN}$x|yuZ4-2_Md1XZ##v_8~C4OC* zXaw&W4S^Rf1g~EGo(wzUV%>Q+RlIT~U;c1qTE)2vb(7!oPan=jRen~8^t&|a^D8@1 zW!^KY^5^QTHjoa@COv8UG-PQGj;{cM6E-C!mJP2TM)Av=QF!vTXH?&~fYEkpPpLMe z;F&z)2^`JMkt zp63rT!ws!azJ6UB_LDIfPcQX=uH{{sRy*08n~04U4vxa)3z}!?L(X`3u-zC3Z^mcf zIW6wNMy!ygN z%$?fyZDHQHYu>rLb8BfXySAL%WxuhtJA6;etv@l-$0NS07+(kURD(ee^~ts`2P!by zp4WC%&2qecvlcXu499LHJEMKPiyi}120dBe+g4EbRnPN7<6{(!-QM2b+r4cXhep`#odiAA@A!kt_Y2ggIsJJ? zf3E+d|E>S^)^;%(4gm;200Izz00bZa0SG_<0uXqk1WMU;E&Zw@H=kY6_?wFCVs=eS zzLuC<%&r&HZzQ6B;D7avY9J~L0SG_<0uX=z1Rwwb2tWV=5P-n{6yW>+^q>A=fdB*` z009U<00Izz00bZa0SG`~h6Ql{e}+33O@jagAOHafKmY;|fB*y_009Uj0=WN=P=Ejg zAOHafKmY;|fB*y_009Whz5wq3&wd}Hg%E%M1Rwwb2tWV=5P$##AOHc}|3?f!00Izz z00bZa0SG_<0uX=z1ZH0V_y1?VkI_O1KmY;|fB*y_009U<00Izz0Pg=I1|R?d2tWV= r5P$##AOHafKmY=>FM#|1v){*PAp{@*0SG_<0uX=z1Rwwb2teRJmcw2M diff --git a/.coverage.dinagraves-macbookpro3.roam.corp.google.com.70665.957167 b/.coverage.dinagraves-macbookpro3.roam.corp.google.com.70665.957167 deleted file mode 100644 index 9a3bbea127e06c87b45d11c915a1826b71b94ad6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53248 zcmeI)O>Y}T7zc1~?AmeSXp5rADpAN>z>R8W<0LIjIY59MDk?!sKu8GO@$T5(c3+&` zb(&N{$SqPo021E-@qK#a!j%uejSJ7SFR|UkRXJ64|Et*9mzmj_-#jzxc(?uf?j1W) zqT>gyjKogva!%87p9qo5<;wJ0qF1(*Xr+*C&~I&QecEa{x4A2p^lx*O;%_Xj?nlb<5lc2pEdQw7QU(r5P$ z_74xl;r^$04n(p~TwM^fG#X-G1pXt@SApo*juN(K*`|zauPdUS%2E$PW$_h{_R%$u z6K=-&d97tzlq*tQDxx3Qt_)7aLv>n@6QpO0)Jc@=phA@0^*DvNnr7b+f$FG0d8P`J zT3ofQjfIV;KQEN3%gfp`6}L$SCjBfq4Hj(DbRE zCsEScz;}(v7mn@4&GbS$vVBje6J-t}WnI|7I-_L^;f=S3%DT@Dx}W4s&o!nq%6vi2 zG*-Zl61cawI2?{AoF-<&FHbv9H`W7xd+*y%XJ; zk#mnGxdxtnG*D-qUl*gC^|%?HUl-g6ih%bQi`BhlEk{wQPQoLHK6tg{AoAnw7Il8B zNpF>3-kC2|*VnaYM{%GqPpfT5;n_-gB52NbPYE49K0R)DluQN*k0QqrekUF>oLeNF zL(x1wW{eC&20YM&pC+W5zSd~t%2FLf+wt3zu@*;6sAz!DT#zN}3_O#EO2}<6{bLo# zuG&nGCey;}4kQYlX1Q2BSf3U;XCcsPo~9@oY0b#ShoE^6vr=b#^K4=o>6_10!G`JJ*C=+ zlhg2~6NR_34N>dKkSCw8CfdI5DCs4a1WI^2q*K|Uh);d~V)XH-jPR7p=pNVNs$|y` zp4|^=tYyQBR$NzlR(hG@t8Y>&P5C?~`8>(oK^aAj#$re#^Mx|ALerx>QDx?9-4$?80OfRjFuH~-Gs-14mO~l3v2S;J@CC#(+A!j^1*lvu2H0jx)w1Nc!5P$##AOHafKmY;|fB*y_@YV`c3i&lXdrqSHZa%-V!_Nt9Z*6Zi zn%j-7o1%IBR&(#x_Kl^v{OWRgm;L(Y&hS00u=b>xJs$CW&G;syry2};s84nSd8|UC z>-$|tHB84JSdGwnXgGE|-5KxWUGx~BGU&;Iz&68Hp!$9gseqn#sMSTyIF^CY@g0lH z^&T40cJIbX&$Di9xA%5F>^<(8P3QDz_vY5t?#|7oacD$t|9WT7eH`prwI3F!PYe3< zoc>(@NB>*@>#gl#G#mmDfB*y_009U<00Izz00bcLMhR5%Yg+bIMPWX_qVYEs`NjOI zmVPZUx0qimXWvM~|G@w98`VHm76K4}00bZa0SG_<0uX=z1Rwx`|0%%t|LH&d!vX;a zKmY;|fB*y_009U<00IzzzzhrE{{IYjE}8}b2tWV=5P$##AOHafKmY;|NCj~JAE5vN z2tWV=5P$##AOHafKmY;|n0*1<|DXLnMhhVT0SG_<0uX=z1Rwwb2tWV=xc`qBfB*y_ z009U<00Izz00bZa0SL^#0Pg?KejlTS5P$##AOHafKmY;|fB*y_00G?pM+`s!0uX=z s1Rwwb2tWV=5P$##W?umJ|7X9C(LxA700Izz00bZa0SG_<0uX?}f2rhMO#lD@