Author: dmacvicar
Date: Tue May 8 03:01:20 2007
New Revision: 5515
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5515&view=rev
Log:
trying to fix key import bug, so lets make test better
Added:
trunk/libzypp/tests/zypp/data/KeyRing/
trunk/libzypp/tests/zypp/data/KeyRing/private.asc
trunk/libzypp/tests/zypp/data/KeyRing/public.asc
trunk/libzypp/tests/zypp/data/KeyRing/readme.txt
trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml
trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml.asc
Modified:
trunk/libzypp/tests/zypp/KeyRing.cc
Modified: trunk/libzypp/tests/zypp/KeyRing.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/KeyRing.cc?rev=5515&r1=5514&r2=5515&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/KeyRing.cc (original)
+++ trunk/libzypp/tests/zypp/KeyRing.cc Tue May 8 03:01:20 2007
@@ -11,6 +11,7 @@
#include "zypp/TmpPath.h"
#include
+#include
#include
using boost::unit_test::test_suite;
@@ -249,25 +250,30 @@
virtual bool askUserToAcceptUnsignedFile( const std::string &file )
{
+ MIL << std::endl;
return true;
}
virtual bool askUserToAcceptUnknownKey( const std::string &file, const std::string &id )
{
+ MIL << std::endl;
return true;
}
virtual bool askUserToImportKey( const PublicKey &key )
{
+ MIL << std::endl;
DBG << "By default zypp-query-pool does not import keys for now." << std::endl;
return false;
}
virtual bool askUserToTrustKey( const PublicKey &key )
{
+ MIL << std::endl;
return true;
}
virtual bool askUserToAcceptVerificationFailed( const std::string &file, const PublicKey &key )
{
+ MIL << std::endl;
return true;
}
};
@@ -322,7 +328,7 @@
};
-void keyring_test()
+void keyring_test( const string &dir )
{
KeyRingCallbacks keyring_callbacks;
KeyRingSignalReceiver receiver;
@@ -356,9 +362,25 @@
test_suite*
init_unit_test_suite( int argc, char* argv[] )
{
+ string datadir;
+ if (argc < 2)
+ {
+ datadir = TESTS_SRC_DIR;
+ datadir = (Pathname(datadir) + "/zypp/data/KeyRing").asString();
+ cout << "keyring_test:"
+ " path to directory with test data required as parameter. Using " << datadir << endl;
+ //return (test_suite *)0;
+ }
+ else
+ {
+ datadir = argv[1];
+ }
+
+ std::string const params[] = { datadir };
//set_log_stream( std::cout );
- test_suite* test= BOOST_TEST_SUITE( "PublicKeyTest" );
- test->add( BOOST_TEST_CASE( &keyring_test ), 0 /* expected zero error */ );
- return test;
+ test_suite* test= BOOST_TEST_SUITE( "PublicKeyTest" );
+ test->add(BOOST_PARAM_TEST_CASE( &keyring_test,
+ (std::string const*)params, params+1));
+ return test;
}
Added: trunk/libzypp/tests/zypp/data/KeyRing/private.asc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/KeyRing/private.asc?rev=5515&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/KeyRing/private.asc (added)
+++ trunk/libzypp/tests/zypp/data/KeyRing/private.asc Tue May 8 03:01:20 2007
@@ -0,0 +1,33 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+lQHhBEY/vAIRBAD2cxLY83P2G1h5TkkKYQYTLopgWQh7/7H5UK0cf62gLH7R6F7B
+wW4EqmLsm8eGE8kIOob5wCQU6pxpBMv+1UYoO1bohtx4L2JUY5ycJiq4u1CNyRuc
+iR3ygsueMRkelkQ2hpNuKvmficOcoazvU3tZM6ITJjV/tQvYTQRGqwEfwwCgs0OY
+3q7eR8NwWekaj23t8TV7hjMEANS6QMgjsp5CdLglX02oeiCG82oEKLDOWoZ2ajD+
++nazSIflJE0DaZ0W26QXewh7IRzTomV98fJV6inQNanlk5/TNuAb1elXdaYFuNbn
+Z0yoOaTJx/mb88vm63Ur8FTyKdcN+dau8yzuNlJggj5yBcNg+/8ZOAm1ZkDMlg9u
+AhgDA/0RSjXu/YNmflePFxIKBCAJFJenz4dQUZeb5cuJv20eCqnKn5CFYFU6YYg3
+sYaEtZeultDXweRveGwe28E/vpLUa7p+aZq+XwtjI6U6W5VqvkCKIUsQqwVWRHin
+1/4DABJ5rnU+yPeLXNH6jrMQ+jDG8RieI91/4n+gCX1nbwZQ/v4DAwKtVz8ehZCg
+rWAxhnYmmTtu8nnzDEF6BWQfS7gSUCu66LgtoWSjLfBuiZk0bSNDIrPPy6ZKvOOq
+MrHTBrQrWllwcCB0ZXN0Y2FzZSBrZXkgPHp5cHAtZGV2ZWxAb3BlbnN1c2Uub3Jn
+PohgBBMRAgAgBQJGP7wCAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQvWHY
+m9mIIb7TJQCfTe4MwrmOlWDxWV3yZ6E4B9xQq0YAoIWvs4oYVzbaQzclStHai5kx
+uGn8nQJjBEY/vAwQCAD4T11KPE7CzkqgGMaNP+yNQzfUDbd/SaEQ5Wce5q3VvmVB
+pYORxyWjS8QMc9ge8WxezAsjyTKsXl+u7e/QmMKspPzPhkVKyB6s5D8FhR1Pdo7b
+Ai4xx+NLOu9DuuU+jqUkyHYlt8QF2zX98OOcCIuQc2hjk12dvfHKmUiDoUnfuQPx
+vYrFAWnesgUJMqZo7Td5Ly4IjfMJQlQ7A186BGU8bPWoV1QqUInVkNGNXLmglel/
+m+MTV05nT6+1KCBqCRUluHqDaCiFHOUOFVWvtirmPJZ/67J78NJpF7huzXvkQraa
+tXyHnAyhwiwTZLq2jabMjQgGhV8QyKd4qniSBL+jAAMGCACfH4FGqrs9pGBURmSj
+ZKlHAUdnGul0M2KuyJhv8ZBkApUtPcMhZJco50pFpkqjfH7f3xXMRVDP5FpjaRt6
+7abbezp/Dgs8+691OtAREDWbAzarNNR3FbB9fUebh1J2i4W7tfBcoKwKFWJCvqX2
+HGTzVy1k33vnuGCVwC/KiZ/C6pc4DqUwCWNoZNd8hmFadJgx3CMlxSTllsaIyOXp
+8dMJ+FFsTmzONzZpFC9DDtpaUeEChCptjWwy5WkQFPe+FOLUH1BnGScQYwGlE8l+
+cFkE7hW8tyOwcx4sk1J/tDCeJ1wE8we1LXMdIiD5ugf3Jej1/98o+hQTHjfkwGqC
+GWJV/gMDAq1XPx6FkKCtYI80yXvLiqb3UuzJbGJv5vVmdtsUcwiHhGnyWRd6AbKy
+Z0sflw+3PmpqEuAZ8LsdfJv8uIhkWh2W+eDYBrZBJ4IqQogALCf+AMCISQQYEQIA
+CQUCRj+8DAIbDAAKCRC9Ydib2Yghvk73AJ9cke9SDyJr+M+nusuWZqzdsJYr0wCc
+DHnEr0GsuEal8fCTCJuMQScd4zo=
+=7nLA
+-----END PGP PRIVATE KEY BLOCK-----
Added: trunk/libzypp/tests/zypp/data/KeyRing/public.asc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/KeyRing/public.asc?rev=5515&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/KeyRing/public.asc (added)
+++ trunk/libzypp/tests/zypp/data/KeyRing/public.asc Tue May 8 03:01:20 2007
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQGiBEY/vAIRBAD2cxLY83P2G1h5TkkKYQYTLopgWQh7/7H5UK0cf62gLH7R6F7B
+wW4EqmLsm8eGE8kIOob5wCQU6pxpBMv+1UYoO1bohtx4L2JUY5ycJiq4u1CNyRuc
+iR3ygsueMRkelkQ2hpNuKvmficOcoazvU3tZM6ITJjV/tQvYTQRGqwEfwwCgs0OY
+3q7eR8NwWekaj23t8TV7hjMEANS6QMgjsp5CdLglX02oeiCG82oEKLDOWoZ2ajD+
++nazSIflJE0DaZ0W26QXewh7IRzTomV98fJV6inQNanlk5/TNuAb1elXdaYFuNbn
+Z0yoOaTJx/mb88vm63Ur8FTyKdcN+dau8yzuNlJggj5yBcNg+/8ZOAm1ZkDMlg9u
+AhgDA/0RSjXu/YNmflePFxIKBCAJFJenz4dQUZeb5cuJv20eCqnKn5CFYFU6YYg3
+sYaEtZeultDXweRveGwe28E/vpLUa7p+aZq+XwtjI6U6W5VqvkCKIUsQqwVWRHin
+1/4DABJ5rnU+yPeLXNH6jrMQ+jDG8RieI91/4n+gCX1nbwZQ/rQrWllwcCB0ZXN0
+Y2FzZSBrZXkgPHp5cHAtZGV2ZWxAb3BlbnN1c2Uub3JnPohgBBMRAgAgBQJGP7wC
+AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQvWHYm9mIIb7TJQCfTe4MwrmO
+lWDxWV3yZ6E4B9xQq0YAoIWvs4oYVzbaQzclStHai5kxuGn8uQINBEY/vAwQCAD4
+T11KPE7CzkqgGMaNP+yNQzfUDbd/SaEQ5Wce5q3VvmVBpYORxyWjS8QMc9ge8Wxe
+zAsjyTKsXl+u7e/QmMKspPzPhkVKyB6s5D8FhR1Pdo7bAi4xx+NLOu9DuuU+jqUk
+yHYlt8QF2zX98OOcCIuQc2hjk12dvfHKmUiDoUnfuQPxvYrFAWnesgUJMqZo7Td5
+Ly4IjfMJQlQ7A186BGU8bPWoV1QqUInVkNGNXLmglel/m+MTV05nT6+1KCBqCRUl
+uHqDaCiFHOUOFVWvtirmPJZ/67J78NJpF7huzXvkQraatXyHnAyhwiwTZLq2jabM
+jQgGhV8QyKd4qniSBL+jAAMGCACfH4FGqrs9pGBURmSjZKlHAUdnGul0M2KuyJhv
+8ZBkApUtPcMhZJco50pFpkqjfH7f3xXMRVDP5FpjaRt67abbezp/Dgs8+691OtAR
+EDWbAzarNNR3FbB9fUebh1J2i4W7tfBcoKwKFWJCvqX2HGTzVy1k33vnuGCVwC/K
+iZ/C6pc4DqUwCWNoZNd8hmFadJgx3CMlxSTllsaIyOXp8dMJ+FFsTmzONzZpFC9D
+DtpaUeEChCptjWwy5WkQFPe+FOLUH1BnGScQYwGlE8l+cFkE7hW8tyOwcx4sk1J/
+tDCeJ1wE8we1LXMdIiD5ugf3Jej1/98o+hQTHjfkwGqCGWJViEkEGBECAAkFAkY/
+vAwCGwwACgkQvWHYm9mIIb5O9wCfeI0Ro1UCK/CVT1/BH9NNB0TyYzAAmwdQFE6I
+aVStjbDRYEnTHQOGsVy9
+=LiUY
+-----END PGP PUBLIC KEY BLOCK-----
Added: trunk/libzypp/tests/zypp/data/KeyRing/readme.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/KeyRing/readme.txt?rev=5515&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/KeyRing/readme.txt (added)
+++ trunk/libzypp/tests/zypp/data/KeyRing/readme.txt Tue May 8 03:01:20 2007
@@ -0,0 +1,2 @@
+passphrase for the key pair is zypp-devel
+
Added: trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml?rev=5515&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml (added)
+++ trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml Tue May 8 03:01:20 2007
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<repomd xmlns="http://linux.duke.edu/metadata/repo">
+ <data type="other">
+ <location href="repodata/other.xml.gz"/>
+ <checksum type="sha">49589f0e6569914ada9293e8c3895cb899b58a58</checksum>
+ <timestamp>1177395604</timestamp>
+ <open-checksum type="sha">67b155adc1e7622f7962849ee43965253a797765</open-checksum>
+ </data>
+ <data type="filelists">
+ <location href="repodata/filelists.xml.gz"/>
+ <checksum type="sha">4174aed6d4ffb8cfee41b64ae357ce1db3fe904a</checksum>
+ <timestamp>1177395604</timestamp>
+ <open-checksum type="sha">1981b7db9252974869ce1d71443bde69fa9423ca</open-checksum>
+ </data>
+ <data type="primary">
+ <location href="repodata/primary.xml.gz"/>
+ <checksum type="sha">2a72bebe987fb613673d9db73120e95a999f143d</checksum>
+ <timestamp>1177395604</timestamp>
+ <open-checksum type="sha">6a328b1ec1fab195fb69035c13fe4340ee2b9cbd</open-checksum>
+ </data>
+</repomd>
Added: trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml.asc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml.asc?rev=5515&view=auto
==============================================================================
--- trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml.asc (added)
+++ trunk/libzypp/tests/zypp/data/KeyRing/repomd.xml.asc Tue May 8 03:01:20 2007
@@ -0,0 +1,16 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+owGtkz9oFEEUxs8cATlQSG2zLmiX253/88LeXWUawUobu/nzNrfk9vbY3ZMYECwi
+pLCwiU3A1sreJrYW1kK0srNQrLR393JRFDEp0s18fO99M7+Z9+xKt7OydmSODz/s
+X39z6VX3re2VOCty39/JJ5ujdyvJqFkED7CssmI6CEk/DgOcusJn061BeO/u5roO
+R8NeclIVNOZpNQjHdT3biKJJNp3v9P18G/vo51GOtfGmNlFrDoe9IEjabVA/nOEg
+LOoxlgu10SeFM3WTGIxLTAdhW7CoXJjas/W3dsNoaXZjdNvVPF82qsYmHHIQGtIY
+pZAAhDe5QIGhdkyDcFYDWKGN0El0Wr1sVmc5VrXJZ0NClGIgZMyT6Ld64ipmOF3/
+V65UlghhvCOoJKWpAkk1B0TOQAoqmFGglBRJ9EeLBYyoveLfWNJsgpOsqquz0Pwy
+ngsPUdygl56nqdUubc5HrGwkJpRD4i1LEWJuLhoPAU2s8haooKC4ltCmKcI5sx4l
+pAY4Zc6cG8+szHJTPjwLztJ2HjTUKGrRImiVWkmYVMyDt4oRGiMIAwAp4cxf+M8x
+jGpL0JHUWAKiCYeYCUeap+CMx4jUgrP+P2iS6GQMh739UXe1087v6Wyvrex+6xyu
+fv3xZO/5zU97919eff+leHR069px58XG9urTy3duHxx8PLjxef/1941u+fgn
+=9GUB
+-----END PGP MESSAGE-----
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
dmacvicar＠svn.opensuse.org