From fb2e1adb5ce89ef8949facb1300b2f7da34e9b25 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <Smirnov.Andrey@gmail.com>
Date: Wed, 12 Feb 2014 21:25:55 +0400
Subject: [PATCH] Use different keyring in system tests.

---
 system/files/aptly.pub         | Bin 0 -> 915 bytes
 system/files/aptly.sec         | Bin 0 -> 977 bytes
 system/gpg-gen-key             |  13 +++++++++++++
 system/lib.py                  |   9 ++++++---
 system/t05_snapshot/drop.py    |   6 +++---
 system/t06_publish/drop.py     |   4 ++--
 system/t06_publish/list.py     |   4 ++--
 system/t06_publish/snapshot.py |  21 ++++++++++++---------
 8 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 system/files/aptly.pub
 create mode 100644 system/files/aptly.sec
 create mode 100644 system/gpg-gen-key

diff --git a/system/files/aptly.pub b/system/files/aptly.pub
new file mode 100644
index 0000000000000000000000000000000000000000..08758e4302de6ce4f49a2af5c44c3933784c7aaa
GIT binary patch
literal 915
zcmV;E18n@60ipy_`=yT&1OU0Xct7+Dh9|KF?G`P|&qxfns=ia+?_C}Z3Q77aY&oDm
z=DPPGT}v`rhosG`k(mHKkP*T<;A>!VCtNV^wrbkr>Li1<EtVEcwc>NuVz(`hR_)ne
z3th6NpdiQ7<<KBDXkO-0`>Fwy!G{GEu6DDvIH>J2*jMl!ZAe17%%=dL<rE=Ot2v26
zoetU_LN)oBXb^@m1OSb5eRVIr!>dNX<rvbKW+)knV7e!cqj?_<o&Q2x2v<vI^Fg9=
z4zEL^xi3AK7ElI@EGJ(WMCvav%4$5Pg)M$Mcf~;5?~?HkL=>9~nLZfdb`w!OtYzEZ
zU$tG7+;oa-r;o+m6H6^)RKfTUEn;!>+{aCdpam;laCrjBCQ$?bPc%>)c$RkTb8gOo
zrva@giIB^900*$mRq4tsG9J{_hH8zMD=;ruT--<4KXg9&0lu4`2*h(Q_s&%G^(Qn2
zVuFZYUd@|3-K+MvV<Of>;N!hz-S>vtdu82MEjJB_U#G=RRF%3O;1~3hdN8HZHx{C9
z1CNbQHrRY!)*y&Ov@Jn!bZmJbRAqB?WpW@WWN&UKbRczeWguyEDIh#_Wpi{uVQ_S8
zc`j*gW^X=-VgwTr0stZf0#f^>j{+Mb1`7!Y2Ll2I6$k<e3JU}l0s{d89svRufB*^!
z5Fy*RoEF<YZQ8^DpxOS>zyoEjx*d~P+M;6PgR0^f+5npe&Ob>g0mP-)vE<&{=?mIr
z23Ur<0SyFF`=yT%1OW6E{*kf_=~7suCOy4D*L(qZ6Ku9KyXE#t+4?gNe8$M_(Kmq-
zP;Yssfh76u=2mM8H4M=@hjQB<z<8RP==E~cT|)tZbZk1V1LRFIg7De?(qYR$Fcu`v
zT%j!e>hqbgdyn+ihl14|aY*z!=QmG;cwgo~FYwKN))*q5??(Uw1q1-f`}d!7QG;m{
zd-x)&h$fKs*|h%_ERc**yvS^~>Cd~E<M&l)w3j||7OI{{(?b^G!%G8%i%G%Fb7qQS
z^7;}mF`?sa0^=;;=F9Z`z@VUb35wS!6X}3PB$wq*7Ifs#G*6g8wGcheXQ)nnFm5i4
zE@1zyu`T*l4}BmwS4(z?Ndy=X0ssjG0#f^>j{+ME0162ZA=|i|7TZ2;IfekBy@su2
pbXyVDebzEULM=)oxk=@Z0G>PR9ZewfiG<^n85QUm&on6Zx23xEox=bC

literal 0
HcmV?d00001

diff --git a/system/files/aptly.sec b/system/files/aptly.sec
new file mode 100644
index 0000000000000000000000000000000000000000..f90e1c913181ff15a8dc9434d9b43a64ccefee16
GIT binary patch
literal 977
zcmV;?11|iP0lNfJ`=yT&1OU0Xct7+Dh9|KF?G`P|&qxfns=ia+?_C}Z3Q77aY&oDm
z=DPPGT}v`rhosG`k(mHKkP*T<;A>!VCtNV^wrbkr>Li1<EtVEcwc>NuVz(`hR_)ne
z3th6NpdiQ7<<KBDXkO-0`>Fwy!G{GEu6DDvIH>J2*jMl!ZAe17%%=dL<rE=Ot2v26
zoetU_LN)oBXb^@m1OSb5eRVIr!>dNX<rvbKW+)knV7e!cqj?_<o&Q2x2v<vI^Fg9=
z4zEL^xi3AK7ElI@EGJ(WMCvav%4$5Pg)M$Mcf~;5?~?HkL=>9~nLZfdb`w!OtYzEZ
zU$tG7+;oa-r;o+m6H6^)RKfTUEn;!>+{aCdpam;laCrjBCQ$?bPc%>)c$RkTb8gOo
zrva@giIB^900*$mRq4tsG9J{_hH8zMD=;ruT--<4KXg9&0lu4`2*h(Q_s&%G^(Qn2
zVuFZYUd@|3-K+MvV<Of>;N!hz-S>vtdu82MEjJB_U#G=RRF%3O;1~3hdN8HZHx{C9
z1CNbQHrRY!)*y&O005w)1dfm)xUZvne1p<;!PnDwZ9?-4)U+)@aCB^WAXH^@bY*fN
zC}eMLCv+fnb7dfDbSWS_bY*jNKw)rnY<VteZf0*jh++g25dr`r1p-q0rH=v|BL)iz
z2nPcK1{DYb2?`4Y76JnS0v-VZ7k~f?2@oOMxSST-K5g2>0HE3a(ZB;`uDTtQSlXgu
z<AbW=7}@}v2hKl9C;`N!*s<i^+vyA1Wd>M=odGfgQv0Qk5Cj1975<U34Czu>qb5DQ
zLDzf%coS^4GrQ&XN!j`{4}8YR?a?=Z5>Rh>r-3B-?dDc%3N;MTI)`%G9>92-n&|a%
z)LlaXfply-t^?#vGJ^2g{?cK~Krj|0&Rn4^{p$0Xv3rm7)`x=C9dStXI_Eb}gm_=(
zKriske%2Twp6^Eh0|f*C%KP`9b5Vn76MOg~tB59$_Sv-m7A%mAQM|}(x9QKjnB(_V
zXtb9;au%wdN7F+V;=@Y=go{bR&2wgoV)FVDFfpOyZ35#g;O5Kp{lK80cnONvC==;`
zMkJTzP8M|J&oob%LA4M)&u6GkeK2k=j4ojRt+6foRS$h2I9E${008;|bEM3c%`#AN
zru560gfdK6&xeM|gQ~xG>`LCTiFnl$FNjG57!d*h2?YXD`=yTp8w>yn2@oOMxSST-
zK5aRM0H0M8G=^ntPd5ey_o*~SD*~Mfd4vF;U8*?cN<@Qwtw{io%pDp^eS*?nqr<u|

literal 0
HcmV?d00001

diff --git a/system/gpg-gen-key b/system/gpg-gen-key
new file mode 100644
index 00000000..6af211b9
--- /dev/null
+++ b/system/gpg-gen-key
@@ -0,0 +1,13 @@
+Key-Type: DSA
+Key-Length: 1024
+Subkey-Type: ELG-E
+Subkey-Length: 1024
+Name-Real: Aptly Tester
+Name-Comment: don't use it
+Name-Email: test@aptly.info
+Expire-Date: 0
+%pubring aptly.pub
+%secring aptly.sec
+# Do a commit here, so that we can later print "done" :-)
+%commit
+%echo done
\ No newline at end of file
diff --git a/system/lib.py b/system/lib.py
index e0be0768..3140cc9c 100644
--- a/system/lib.py
+++ b/system/lib.py
@@ -129,9 +129,6 @@ class BaseTest(object):
                           os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "flat.key")])
 
         if hasattr(self, "fixtureCmds"):
-            if self.fixtureWebServer:
-                params = {'url': self.webServerUrl}
-                self.fixtureCmds = [string.Template(cmd).substitute(params) for cmd in self.fixtureCmds]
             for cmd in self.fixtureCmds:
                 self.run_cmd(cmd)
 
@@ -141,6 +138,12 @@ class BaseTest(object):
     def run_cmd(self, command, expected_code=0):
         try:
             if not hasattr(command, "__iter__"):
+                params = {'files': os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files")}
+                if self.fixtureWebServer:
+                    params['url'] = self.webServerUrl
+
+                command = string.Template(command).substitute(params)
+
                 command = shlex.split(command)
             environ = os.environ.copy()
             environ["LC_ALL"] = "C"
diff --git a/system/t05_snapshot/drop.py b/system/t05_snapshot/drop.py
index 8683ce2c..80cb4beb 100644
--- a/system/t05_snapshot/drop.py
+++ b/system/t05_snapshot/drop.py
@@ -51,7 +51,7 @@ class DropSnapshot4Test(BaseTest):
     fixturePool = True
     fixtureCmds = [
         "aptly snapshot create snap1 from mirror gnuplot-maverick",
-        "aptly publish snapshot snap1"
+        "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap1"
     ]
     runCmd = "aptly snapshot drop snap1"
     expectedCode = 1
@@ -65,7 +65,7 @@ class DropSnapshot5Test(BaseTest):
     fixturePool = True
     fixtureCmds = [
         "aptly snapshot create snap1 from mirror gnuplot-maverick",
-        "aptly publish snapshot snap1"
+        "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap1"
     ]
     runCmd = "aptly snapshot drop --force snap1"
     expectedCode = 1
@@ -88,7 +88,7 @@ class DropSnapshot7Test(BaseTest):
     fixturePool = True
     fixtureCmds = [
         "aptly snapshot create snap1 from mirror gnuplot-maverick",
-        "aptly publish snapshot snap1",
+        "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap1",
         "aptly publish drop maverick",
     ]
     runCmd = "aptly snapshot drop snap1"
diff --git a/system/t06_publish/drop.py b/system/t06_publish/drop.py
index c9066cc3..6a21f32f 100644
--- a/system/t06_publish/drop.py
+++ b/system/t06_publish/drop.py
@@ -9,7 +9,7 @@ class PublishDrop1Test(BaseTest):
     fixturePool = True
     fixtureCmds = [
         "aptly snapshot create snap1 from mirror gnuplot-maverick",
-        "aptly publish snapshot snap1",
+        "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap1",
     ]
     runCmd = "aptly publish drop maverick"
     gold_processor = BaseTest.expand_environ
@@ -29,7 +29,7 @@ class PublishDrop2Test(BaseTest):
     fixturePool = True
     fixtureCmds = [
         "aptly snapshot create snap1 from mirror gnuplot-maverick",
-        "aptly publish snapshot snap1 ppa/smira",
+        "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap1 ppa/smira",
     ]
     runCmd = "aptly publish drop maverick ppa/smira"
     gold_processor = BaseTest.expand_environ
diff --git a/system/t06_publish/list.py b/system/t06_publish/list.py
index a0fd8694..0c720669 100644
--- a/system/t06_publish/list.py
+++ b/system/t06_publish/list.py
@@ -17,7 +17,7 @@ class PublishList2Test(BaseTest):
     fixtureCmds = [
         "aptly snapshot create snap1 from mirror gnuplot-maverick",
         "aptly snapshot merge snap2 snap1",
-        "aptly publish snapshot snap1",
-        "aptly -architectures=amd64 publish snapshot -distribution=wheezy -component=contrib snap2 ppa/smira",
+        "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap1",
+        "aptly -architectures=amd64 publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=wheezy -component=contrib snap2 ppa/smira",
     ]
     runCmd = "aptly publish list"
diff --git a/system/t06_publish/snapshot.py b/system/t06_publish/snapshot.py
index cfcfd0e4..406963fd 100644
--- a/system/t06_publish/snapshot.py
+++ b/system/t06_publish/snapshot.py
@@ -1,5 +1,6 @@
 import os
 import hashlib
+import inspect
 from lib import BaseTest
 
 
@@ -16,7 +17,7 @@ class PublishSnapshot1Test(BaseTest):
     fixtureCmds = [
         "aptly snapshot create snap1 from mirror gnuplot-maverick",
     ]
-    runCmd = "aptly publish snapshot snap1"
+    runCmd = "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap1"
     gold_processor = BaseTest.expand_environ
 
     def check(self):
@@ -39,8 +40,10 @@ class PublishSnapshot1Test(BaseTest):
         self.check_file_contents('public/dists/maverick/Release', 'release', match_prepare=strip_processor)
 
         # verify signatures
-        self.run_cmd(["gpg", "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')])
-        self.run_cmd(["gpg", "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'),
+        self.run_cmd(["gpg", "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"),
+                      "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/InRelease')])
+        self.run_cmd(["gpg",  "--keyring", os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "aptly.pub"),
+                      "--verify", os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release.gpg'),
                       os.path.join(os.environ["HOME"], ".aptly", 'public/dists/maverick/Release')])
 
         # verify sums
@@ -83,7 +86,7 @@ class PublishSnapshot2Test(BaseTest):
     fixtureCmds = [
         "aptly snapshot create snap2 from mirror gnuplot-maverick",
     ]
-    runCmd = "aptly publish snapshot -distribution=squeeze snap2"
+    runCmd = "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=squeeze snap2"
     gold_processor = BaseTest.expand_environ
 
     def check(self):
@@ -115,7 +118,7 @@ class PublishSnapshot3Test(BaseTest):
     fixtureCmds = [
         "aptly snapshot create snap3 from mirror gnuplot-maverick",
     ]
-    runCmd = "aptly publish snapshot -distribution=squeeze -component=contrib snap3"
+    runCmd = "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=squeeze -component=contrib snap3"
     gold_processor = BaseTest.expand_environ
 
     def check(self):
@@ -147,7 +150,7 @@ class PublishSnapshot4Test(BaseTest):
     fixtureCmds = [
         "aptly snapshot create snap4 from mirror gnuplot-maverick",
     ]
-    runCmd = "aptly -architectures=i386 publish snapshot -distribution=squeeze snap4"
+    runCmd = "aptly -architectures=i386 publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=squeeze snap4"
     gold_processor = BaseTest.expand_environ
 
     def check(self):
@@ -179,7 +182,7 @@ class PublishSnapshot5Test(BaseTest):
     fixtureCmds = [
         "aptly snapshot create snap5 from mirror gnuplot-maverick",
     ]
-    runCmd = "aptly publish snapshot -distribution=squeeze snap5 ppa/smira"
+    runCmd = "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=squeeze snap5 ppa/smira"
 
     gold_processor = BaseTest.expand_environ
 
@@ -221,7 +224,7 @@ class PublishSnapshot7Test(BaseTest):
     fixturePool = True
     fixtureCmds = [
         "aptly snapshot create snap7 from mirror gnuplot-maverick",
-        "aptly publish snapshot snap7",
+        "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap7",
     ]
     runCmd = "aptly publish snapshot snap7"
     expectedCode = 1
@@ -235,7 +238,7 @@ class PublishSnapshot8Test(BaseTest):
     fixturePool = True
     fixtureCmds = [
         "aptly snapshot create snap8 from mirror gnuplot-maverick",
-        "aptly publish snapshot snap8 ./ppa",
+        "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec snap8 ./ppa",
     ]
     runCmd = "aptly publish snapshot snap8 ppa"
     expectedCode = 1