LGTM, thanks
On Fri, Mar 21, 2014 at 4:07 PM, Petr Pudlak <[email protected]> wrote: > .. and update it to work with ConfigWriter instead of the 'security' > module. > > Signed-off-by: Petr Pudlak <[email protected]> > --- > test/py/ganeti.config_unittest.py | 32 ++++++++++++++++++++++++ > test/py/ganeti.utils.security_unittest.py | 41 > ------------------------------- > 2 files changed, 32 insertions(+), 41 deletions(-) > > diff --git a/test/py/ganeti.config_unittest.py b/test/py/ > ganeti.config_unittest.py > index 5f341a4..eec52c9 100755 > --- a/test/py/ganeti.config_unittest.py > +++ b/test/py/ganeti.config_unittest.py > @@ -626,6 +626,38 @@ class TestConfigRunner(unittest.TestCase): > expected_key = constants.SS_HVPARAMS_PREF + constants.HT_XEN_PVM > self.assertTrue(expected_key in ssconf_values) > > + def testAddAndRemoveCerts(self): > + cfg = self._get_object() > + self.assertEqual(0, len(cfg.GetCandidateCerts())) > + > + node_uuid = "1234" > + cert_digest = "foobar" > + cfg.AddNodeToCandidateCerts(node_uuid, cert_digest, > + warn_fn=None, info_fn=None) > + self.assertEqual(1, len(cfg.GetCandidateCerts())) > + > + # Try adding the same cert again > + cfg.AddNodeToCandidateCerts(node_uuid, cert_digest, > + warn_fn=None, info_fn=None) > + self.assertEqual(1, len(cfg.GetCandidateCerts())) > + self.assertTrue(cfg.GetCandidateCerts()[node_uuid] == cert_digest) > + > + # Overriding cert > + other_digest = "barfoo" > + cfg.AddNodeToCandidateCerts(node_uuid, other_digest, > + warn_fn=None, info_fn=None) > + self.assertEqual(1, len(cfg.GetCandidateCerts())) > + self.assertTrue(cfg.GetCandidateCerts()[node_uuid] == other_digest) > + > + # Try removing a certificate from a node that is not in the list > + other_node_uuid = "5678" > + cfg.RemoveNodeFromCandidateCerts(other_node_uuid, warn_fn=None) > + self.assertEqual(1, len(cfg.GetCandidateCerts())) > + > + # Remove a certificate from a node that is in the list > + cfg.RemoveNodeFromCandidateCerts(node_uuid, warn_fn=None) > + self.assertEqual(0, len(cfg.GetCandidateCerts())) > + > > def _IsErrorInList(err_str, err_list): > return any(map(lambda e: err_str in e, err_list)) > diff --git a/test/py/ganeti.utils.security_unittest.py b/test/py/ > ganeti.utils.security_unittest.py > index 5b5a2ad..a7c8c52 100755 > --- a/test/py/ganeti.utils.security_unittest.py > +++ b/test/py/ganeti.utils.security_unittest.py > @@ -40,47 +40,6 @@ class TestUuidConversion(unittest.TestCase): > self.assertEqual(uuid_as_int, int(uuid_as_int)) > > > -class TestCandidateCerts(unittest.TestCase): > - > - def setUp(self): > - self._warn_fn = mock.Mock() > - self._info_fn = mock.Mock() > - self._candidate_certs = {} > - > - def testAddAndRemoveCerts(self): > - self.assertEqual(0, len(self._candidate_certs)) > - > - node_uuid = "1234" > - cert_digest = "foobar" > - security.AddNodeToCandidateCerts(node_uuid, cert_digest, > - self._candidate_certs, warn_fn=self._warn_fn, info_fn=self._info_fn) > - self.assertEqual(1, len(self._candidate_certs)) > - > - # Try adding the same cert again > - security.AddNodeToCandidateCerts(node_uuid, cert_digest, > - self._candidate_certs, warn_fn=self._warn_fn, info_fn=self._info_fn) > - self.assertEqual(1, len(self._candidate_certs)) > - self.assertTrue(self._candidate_certs[node_uuid] == cert_digest) > - > - # Overriding cert > - other_digest = "barfoo" > - security.AddNodeToCandidateCerts(node_uuid, other_digest, > - self._candidate_certs, warn_fn=self._warn_fn, info_fn=self._info_fn) > - self.assertEqual(1, len(self._candidate_certs)) > - self.assertTrue(self._candidate_certs[node_uuid] == other_digest) > - > - # Try removing a certificate from a node that is not in the list > - other_node_uuid = "5678" > - security.RemoveNodeFromCandidateCerts( > - other_node_uuid, self._candidate_certs, warn_fn=self._warn_fn) > - self.assertEqual(1, len(self._candidate_certs)) > - > - # Remove a certificate from a node that is in the list > - security.RemoveNodeFromCandidateCerts( > - node_uuid, self._candidate_certs, warn_fn=self._warn_fn) > - self.assertEqual(0, len(self._candidate_certs)) > - > - > class TestGetCertificateDigest(testutils.GanetiTestCase): > > def setUp(self): > -- > 1.9.0.279.gdc9e3eb > > -- -- Helga Velroyen | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
