From dc48bac09740488e8802f1a274e48a486c32d75b Mon Sep 17 00:00:00 2001
From: yao-msft <50888816+yao-msft@users.noreply.github.com>
Date: Wed, 29 Apr 2020 15:31:37 -0700
Subject: [PATCH] Fix e2e tests cert issue (#94)

---
 src/AppInstallerCLIE2ETests/Constants.cs         |   4 ++--
 src/AppInstallerCLIE2ETests/SetUpFixture.cs      |   4 ++--
 .../TestData/IndexPackageInt.cer                 | Bin 1685 -> 0 bytes
 .../TestData/IndexPackageIntRoot.cer             | Bin 0 -> 1460 bytes
 4 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 src/AppInstallerCLIE2ETests/TestData/IndexPackageInt.cer
 create mode 100644 src/AppInstallerCLIE2ETests/TestData/IndexPackageIntRoot.cer

diff --git a/src/AppInstallerCLIE2ETests/Constants.cs b/src/AppInstallerCLIE2ETests/Constants.cs
index 71ff10e33a..5ed84ad6f3 100644
--- a/src/AppInstallerCLIE2ETests/Constants.cs
+++ b/src/AppInstallerCLIE2ETests/Constants.cs
@@ -17,8 +17,8 @@ public class Constants
         public const string AppInstallerTestCertThumbprint = "d03e7a688b388b1edde8476a627531c49db88017";
 
         // Todo: not needed if switch to use prod index for source tests
-        public const string IndexPackageCert = "IndexPackageInt.cer";
-        public const string IndexPackageCertThumbprint = "1da968e670a0257f61628aad20c60c64fdecd41a";
+        public const string IndexPackageRootCert = "IndexPackageIntRoot.cer";
+        public const string IndexPackageRootCertThumbprint = "d17697cc206ed26e1a51f5bb96e9356d6d610b74";
 
         public const string AICLIPackageFamilyName = "AppInstallerCLI_8wekyb3d8bbwe";
         public const string AICLIPackageName = "AppInstallerCLI";
diff --git a/src/AppInstallerCLIE2ETests/SetUpFixture.cs b/src/AppInstallerCLIE2ETests/SetUpFixture.cs
index ec904b8b53..1bfe3b82f2 100644
--- a/src/AppInstallerCLIE2ETests/SetUpFixture.cs
+++ b/src/AppInstallerCLIE2ETests/SetUpFixture.cs
@@ -63,7 +63,7 @@ public void Setup()
             ShouldDisableDevModeOnExit = EnableDevMode(true);
 
             Assert.True(TestCommon.RunCommand("certutil.exe", "-addstore -f \"TRUSTEDPEOPLE\" " + TestCommon.GetTestDataFile(Constants.AppInstallerTestCert)));
-            Assert.True(TestCommon.RunCommand("certutil.exe", "-addstore -f \"TRUSTEDPEOPLE\" " + TestCommon.GetTestDataFile(Constants.IndexPackageCert)));
+            Assert.True(TestCommon.RunCommand("certutil.exe", "-addstore -f \"ROOT\" " + TestCommon.GetTestDataFile(Constants.IndexPackageRootCert)));
 
             if (TestCommon.PackagedContext)
             {
@@ -88,7 +88,7 @@ public void TearDown()
             }
 
             TestCommon.RunCommand("certutil.exe", $"-delstore \"TRUSTEDPEOPLE\" {Constants.AppInstallerTestCertThumbprint}");
-            TestCommon.RunCommand("certutil.exe", $"-delstore \"TRUSTEDPEOPLE\" {Constants.IndexPackageCertThumbprint}");
+            TestCommon.RunCommand("certutil.exe", $"-delstore \"ROOT\" {Constants.IndexPackageRootCertThumbprint}");
 
             if (TestCommon.PackagedContext)
             {
diff --git a/src/AppInstallerCLIE2ETests/TestData/IndexPackageInt.cer b/src/AppInstallerCLIE2ETests/TestData/IndexPackageInt.cer
deleted file mode 100644
index 113b12849e88139bc3e0c1bfb61d22bae1ce9d1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1685
zcmXqLVw-5t#8SC{nTe5!NjRLLWo_VR@s+-3d$)QpFoJjnylk9WZ60mkc^MhGSs4sO
z4TTK^*_cCFn1#7~gFQnOoE;US3=QPOc?~TM%nVG842;c;45P$(jSPTX6DZf9vBQwt
zfD@#TO_(V(7-k5EFjshDaYklddP#nsp@0D&NCmqvdr)dhZhl^hp`3vXNQ6sR)HgG^
zD8D#Atwg~&zo;O;D6u3Hr~_yT#4Vaw<rOqM^GZ^S@)C0tLW@%s{PS`uH4T~=m5@Ef
z$jZRn#K_M86z5`UVq|2PV3Iq3aw6wmo=!Hdofa``JYux`Hc0KQ_FbNT^WYEl-=$9`
zZ&S~bSvu=!YEZ}IDNY-_-^X}uT38r)Wv$5GlE}YX4W6F*7hV0n;m~9?Gn39W!Y)$B
z)?E9^{mIwm)Qb$ez@+O5hK)MO+unZa;VgQ6Anp3Wr|y%a=I?vlZ1`@4+KaV(DvqmN
zeR&f5%fc(}F{Y-7yq#BN-oLS_W7__sbLu%3m%rQht29?^>VrzREe+?qgY7k1x{~iG
zG%Xf9>_2hdH%8ZJC*iQqPuQ$vQ`|njc{bmoVq;3f<>^K*^&Bpk=w0xhc_Pzz`lbo5
z70cs7{x+`6G7tWF{Ks$ZM?KPW-=4@kznO`dk%4h>6H|&o6H|f#H!yr<`B_+)nb;c)
zgh3ot79ImGHV$nzMpjmKW@ZCfkRTt67>h`T!MlLkZEkgc_}3KlE}9vTC47k8AOIvS
z$l__>zQonQ*-+C!9Vo!UEv$fuG5>;8NPHG61eB&0mE<b~WhUnviW!K2l(Gu*8W|f{
zn3`#un3|dx85zifOjKr(Fc51HDU)KH9d@lEMJ_k^A#<mUTK$!c%?6G8Kq}-}8n+oV
zZZ>G#u%L16g2q*C8W|-e1y=g{$-o3uke#WYT$G~^O2Vo}2F{K^BFa$1P*V>m+GY<`
znOh9x>E*(bo?dc(u0BX7P#kCm9s_J)R*|LMps^bkzKo14^#-*DCNRDM6NWbuGZV3T
zqr|`!NtY$mMdjt?xIKg|G)fHY*f@ca&BEAZF3QegXrRxg4&!pP-)bvues`0x>13;P
z<JNhJtzTXzG{!d0KCa%@Gt-@kF@=ed(?A-bpNoah05$cX7B9?AOpFW`S@}I?E^B_K
zFF)M(#i^#lbwSoa_ia_xJr`!&`KP8?{Pgc_$wd>`cV~*L&zlm_d||n9$Vqm6Z&luu
zE1Ek?PETt&5hrN3!^(thQ-dbwfju?y0sPxum8{umx79@OY_olp+qK$6?kBZLO#zV~
z4%K~biaWgG=Lw%bd@NrSo#tJ8++^|ML!U(d;-#nlzdx@bySsi~b^E&v_NBWX$uhfK
z<Lfu*WIx(+CH&h=Jr>?Yf&bO|zGbhfw%PqJ*Ywcl_GxP;JO-ADmFH_DZ@kQXbL@S?
zuXkFnrOLDR^kyf1{2jXJ!DMxr8Buyuf{%MzR)&e&Oe&Mt_{&(SXnC@3JI|8mhZZRP
zp1k8kjh^V2`0%{?+OmI3J9n-=-k|#K>mk_|i5~g;@84McV7i=Ue_teY`3CQU+HZHL
z?>etACtS95UuxO>waeJwaNb|=aI&QL<eib<FPAr6s9Gnse)06P6XV++=VTa5y4g>P
zmp7Ts;wqzl-~QV3Mt;M)N1th)UAnjD&*>*D^Mssg^(LImj^x{L^?}C;6ThY3C2HlK
zTw(Lu`BP8j*4xa|2ivsQ?9uglR5N>t)q^Dwl8P+d_jVrA@SD)Cy_`{LeN=LDgZr%{
zG2YOCWZl<GtlLjKkWniV;i~Gho}6NQ?D{|Xm0VtWT-&7VpT4_)r?RcK$-3akVd2m9
Phi?89_&2|+-<BBw_RDpl

diff --git a/src/AppInstallerCLIE2ETests/TestData/IndexPackageIntRoot.cer b/src/AppInstallerCLIE2ETests/TestData/IndexPackageIntRoot.cer
new file mode 100644
index 0000000000000000000000000000000000000000..4177d302bb44a27eb0e0ad546e124788b0e04051
GIT binary patch
literal 1460
zcmb7DSx}Q#82uAMNJv;5kf4!$4O{-i0D?3X5JZqoSrx^wBZdSL2#5j(h!Cqtu?2#W
zB_NwirGryZmJ))<2tg?>Adw}2><Fzet=RtX<ZI`fJNKM(&pmS=&IP%OzkpnY(n<w5
z3=UVv=)rc)JysTazI{!%tzZJ63KDI>^Wbf$z+f0f0JI`mfaXYrK!k#Zfp>glGK0m4
zVe21FWJf0_($4F<GLo5$WEwkK|2Tue26b^NBr-?=ZOJ5CiY?_NPG!IS4kd#m(Dvm2
zOyj~0zkLo&5m4a5)c}wSSB7)pFyN<=;OP4TR2h6+Xtb+zRZx-hOhb()87oNdoDnuT
zMV$^LQ;#jzdkX8B`Zwy&iKm1)MR!_H6}cw>Vrrjo#C58Cx#2U%f42meD5BK4o-%xL
z<5f#iK6Q)r=51=Huy}svaLV$fVC$t`oUEu|Z_@|iL}_NhifBGz<nemXpa8!ZbRIvL
zO4uCFZkhBgu5+xaR9ep|p1K!ulk8`*hISr5fpX%^&~)t1UA*HZ_i4IH{qRWn;7~{R
zRb#Hn3TATpxyO73O53s@d!6sCd8I!E8_IJ!P4K-|6zcA7O~}UMf2cJMWfF+3IN8w`
zvLl;JG^*OV4?8>{xO17#7d%mNrPZ{xdH8zv()<SZndnXQo>+O$oQZ1@J$aRJMsAsp
zwK_f~aw4Y%<r?zX^gsNcItbzFjx8AiGtMw*nxRLiPH3zR?#WE|Hlu&M|K(@0)_}PU
zPx9{rLsO-!_E4&%V`!GYN0TO7dH1{Fe*8E;9G7=6J2v}~To8TMn1a>y^^BVx+7gb3
zCw1_O;~e~ize;7H2C)+<kr|z%|MdN79l6F*SAR}T<BZ~v!!;h&(--SzZ@)E=`e^vX
zu@*G%EnYgl754~-u0&@=zrPr;p^n0ps=E6wxsb<e!ZK5-WAefFc;LWfzvnwX)&ZSD
zli7veReShSJ_J{Q0Wi_!e(-W1h=Dq)qlQ30t>%Gh+e8Bf`xl`IDnJ{kvn{A1v=Ex3
zi^@^;1D&dK`2nhPy|V5!uM0F#9f`I?!Voa7{chNH0sy9OU(iP+gG?|HiGUyg#(+^s
z6l7CWRD#375Zxdk4q!vW1RMb(G@PBW0q8(H5D6p$41fi#7|3A*aR#IlA#Vb7N`x?L
zM@xnjB7~R_x7o>~f7^KI145050TiC(f<;$DW-hg^q@LkWSk~qiJoshKgf-lpI)Q2A
zgzldtruj>WYJ{MGDvXZR=&@M7wEG%HY_3zXnvoJ-#j0PTsiVcab=|F29c4z?a-)dy
zq-nmUXtV+giW|GXkKfxG_SBD3<={38gf*?Wk7Uj-JKlPnweFL9=5T$p#5A!?Aj#`A
zN>YgAd^KN_cX9M^Qk$0g3X!S*>+z^uvBX1bpCLbx<efQRDF0l&seR=1t51CuUPTZ6
z+RTMMh=bmR3-dl$yG>febrz#<UHYA~#r$M1XXEv6MX0$l<iM)$=#SV3=`UQg^Jd(z
zs+7b|udYKd_g2lR5G_58h2;$iW_p<-RuMie`#8<MPe^8GVOy=5nz~d!VcnDlF!wYA
z1J2^X!}7)jJU*;|_mxDVIgga*^k^YGdqrO^e7>QkwH4uD{tR#KLSPzP(XSoLNXj$Q
z?Gi~BXK5i1l&^2P)STOLSalu~g{9j!ebsghgYAtNaFiU1h$VCK3g~rhw$uibyrw*p
zAz*mV%jpu8@^^MOjsI?O{_B?F$eVR<F{zi{iK=Ygcp)9K)DX*)s>tDPe4ZOU&Me>(
zajD;uT$gX&+PGGZ&9vOSYkA-$dy^==qFZRc*p4cRuC1eoHuT)ijL|7u7LAbl<Fb2E
M9qsz1v;EEg0a++uy#N3J

literal 0
HcmV?d00001