[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master ab7ddde 1/4: Move mml-sec.el test data to follow our conventions
|
From: |
Stefan Kangas |
|
Subject: |
master ab7ddde 1/4: Move mml-sec.el test data to follow our conventions |
|
Date: |
Fri, 23 Oct 2020 21:41:45 -0400 (EDT) |
branch: master
commit ab7dddea907ebb226fd657cc2fad441a374dfd7f
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Move mml-sec.el test data to follow our conventions
* test/lisp/gnus/mml-sec-tests.el (ert-x): Require.
(mml-secure-test-fixture, mml-sec-test--kill-gpg-agent):
Use ert-resource-directory.
* test/lisp/gnus/mml-sec-resources/*: Moved from test/data/mml-sec/.
* .gitignore: Update location of moved file "random_seed".
---
.gitignore | 2 +-
.../gnus/mml-sec-resources}/.gpg-v21-migrated | 0
.../mml-sec => lisp/gnus/mml-sec-resources}/gpg-agent.conf | 0
.../02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key | Bin
.../171B444DE92BEF997229000D9784118A94EEC1C9.key | Bin
.../19FFEBC04DF3E037E16F6A4474DCB7984406975D.key | Bin
.../1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key | Bin
.../293109315BE584AB2EFEFCFCAD64666221D8B36C.key | Bin
.../335689599E1C0F66D73ADCF51E03EE36C97D121F.key | Bin
.../40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key | Bin
.../515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key | Bin
.../5A11B1935C46D0B227A73978DCA1293A85604F1D.key | Bin
.../62643CEBC7AEBE6817577A34399483700D76BD64.key | Bin
.../680D01F368916A0021C14E3453B27B3C5F900683.key | Bin
.../6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key | Bin
.../78C17E134E86E691297F7B719B2F2CDF41976234.key | Bin
.../7F714F4D9D9676638214991E96D45704E4FFC409.key | Bin
.../854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key | Bin
.../93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key | Bin
.../A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key | Bin
.../A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key | Bin
.../AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key | Bin
.../C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key | Bin
.../C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key | Bin
.../C67DAD345455EAD6D51368008FC3A53B8D195B5A.key | Bin
.../CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key | Bin
.../CC68630A06B048F5A91136C162C7A3273E20DE6F.key | Bin
.../E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key | Bin
.../F0117468BE801ED4B81972E159A98FDD4814DCEC.key | Bin
.../F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key | Bin
.../mml-sec => lisp/gnus/mml-sec-resources}/pubring.gpg | Bin
.../mml-sec => lisp/gnus/mml-sec-resources}/pubring.kbx | Bin
.../mml-sec => lisp/gnus/mml-sec-resources}/secring.gpg | Bin
.../mml-sec => lisp/gnus/mml-sec-resources}/trustdb.gpg | Bin
.../mml-sec => lisp/gnus/mml-sec-resources}/trustlist.txt | 0
test/lisp/gnus/mml-sec-tests.el | 7 +++----
36 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 94c0009..29565d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,7 +152,7 @@ test/manual/etags/regexfile
test/manual/etags/ETAGS
test/manual/etags/CTAGS
test/manual/indent/*.new
-test/data/mml-sec/random_seed
+test/lisp/gnus/mml-sec-resources/random_seed
# ctags, etags.
TAGS
diff --git a/test/data/mml-sec/.gpg-v21-migrated
b/test/lisp/gnus/mml-sec-resources/.gpg-v21-migrated
similarity index 100%
rename from test/data/mml-sec/.gpg-v21-migrated
rename to test/lisp/gnus/mml-sec-resources/.gpg-v21-migrated
diff --git a/test/data/mml-sec/gpg-agent.conf
b/test/lisp/gnus/mml-sec-resources/gpg-agent.conf
similarity index 100%
rename from test/data/mml-sec/gpg-agent.conf
rename to test/lisp/gnus/mml-sec-resources/gpg-agent.conf
diff --git
a/test/data/mml-sec/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/680D01F368916A0021C14E3453B27B3C5F900683.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/680D01F368916A0021C14E3453B27B3C5F900683.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/680D01F368916A0021C14E3453B27B3C5F900683.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/680D01F368916A0021C14E3453B27B3C5F900683.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/C67DAD345455EAD6D51368008FC3A53B8D195B5A.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C67DAD345455EAD6D51368008FC3A53B8D195B5A.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/C67DAD345455EAD6D51368008FC3A53B8D195B5A.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C67DAD345455EAD6D51368008FC3A53B8D195B5A.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key
diff --git
a/test/data/mml-sec/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key
b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key
similarity index 100%
rename from
test/data/mml-sec/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key
rename to
test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key
diff --git a/test/data/mml-sec/pubring.gpg
b/test/lisp/gnus/mml-sec-resources/pubring.gpg
similarity index 100%
rename from test/data/mml-sec/pubring.gpg
rename to test/lisp/gnus/mml-sec-resources/pubring.gpg
diff --git a/test/data/mml-sec/pubring.kbx
b/test/lisp/gnus/mml-sec-resources/pubring.kbx
similarity index 100%
rename from test/data/mml-sec/pubring.kbx
rename to test/lisp/gnus/mml-sec-resources/pubring.kbx
diff --git a/test/data/mml-sec/secring.gpg
b/test/lisp/gnus/mml-sec-resources/secring.gpg
similarity index 100%
rename from test/data/mml-sec/secring.gpg
rename to test/lisp/gnus/mml-sec-resources/secring.gpg
diff --git a/test/data/mml-sec/trustdb.gpg
b/test/lisp/gnus/mml-sec-resources/trustdb.gpg
similarity index 100%
rename from test/data/mml-sec/trustdb.gpg
rename to test/lisp/gnus/mml-sec-resources/trustdb.gpg
diff --git a/test/data/mml-sec/trustlist.txt
b/test/lisp/gnus/mml-sec-resources/trustlist.txt
similarity index 100%
rename from test/data/mml-sec/trustlist.txt
rename to test/lisp/gnus/mml-sec-resources/trustlist.txt
diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el
index 4270185..3da620d 100644
--- a/test/lisp/gnus/mml-sec-tests.el
+++ b/test/lisp/gnus/mml-sec-tests.el
@@ -23,6 +23,7 @@
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'message)
(require 'epa)
@@ -65,8 +66,7 @@ instead of gpg-agent."
(let ((agent-info (getenv "GPG_AGENT_INFO"))
(gpghome (getenv "GNUPGHOME")))
(condition-case error
- (let ((epg-gpg-home-directory
- (expand-file-name "test/data/mml-sec" source-directory))
+ (let ((epg-gpg-home-directory (ert-resource-directory))
(mml-smime-use 'epg)
;; Create debug output in empty epg-debug-buffer.
(epg-debug t)
@@ -880,8 +880,7 @@ So the second decryption fails."
(equal (cdr (assq 'comm atts)) "gpg-agent")
(string-match
(concat "homedir.*"
- (regexp-quote (expand-file-name "test/data/mml-sec"
- source-directory)))
+ (regexp-quote (ert-resource-directory)))
(cdr (assq 'args atts))))
(call-process "kill" nil nil nil (format "%d" pid))))))