Revision 31d3b918 test/py/ganeti.serializer_unittest.py

b/test/py/ganeti.serializer_unittest.py
182 182
  def testLeak(self):
183 183
    pDict = serializer.PrivateDict()
184 184
    pDict["bar"] = "egg"
185
    self.assertNotIn("egg", str(pDict), "Value leaked in str(PrivateDict)")
186
    self.assertNotIn("egg", repr(pDict), "Value leaked in repr(PrivateDict)")
187
    self.assertNotIn("egg", "{0}".format(pDict),
185
    self.assertTrue("egg" not in str(pDict), "Value leaked in str(PrivateDict)")
186
    self.assertTrue("egg" not in repr(pDict), "Value leak in repr(PrivateDict)")
187
    self.assertTrue("egg" not in "{0}".format(pDict),
188 188
                     "Value leaked in PrivateDict.__format__")
189
    self.assertNotIn("egg", serializer.Dump(pDict),
189
    self.assertTrue("egg" not in serializer.Dump(pDict),
190 190
                     "Value leaked in serializer.Dump(PrivateDict)")
191 191

  
192 192
  def testProperAccess(self):
193 193
    pDict = serializer.PrivateDict()
194 194
    pDict["bar"] = "egg"
195 195

  
196
    self.assertIs("egg", pDict["bar"].Get(),
197
                  "Value not returned by Private.Get()")
198
    self.assertIs("egg", pDict.GetPrivate("bar"),
199
                  "Value not returned by Private.GetPrivate()")
200
    self.assertIs("egg", pDict.Unprivate()["bar"],
201
                  "Value not returned by PrivateDict.Unprivate()")
202
    self.assertIn(
203
      "egg",
204
      serializer.Dump(pDict,
205
                      private_encoder=serializer.EncodeWithPrivateFields)
206
    )
196
    self.assertTrue("egg" is pDict["bar"].Get(),
197
                    "Value not returned by Private.Get()")
198
    self.assertTrue("egg" is pDict.GetPrivate("bar"),
199
                    "Value not returned by Private.GetPrivate()")
200
    self.assertTrue("egg" is pDict.Unprivate()["bar"],
201
                    "Value not returned by PrivateDict.Unprivate()")
202

  
203
    json = serializer.Dump(pDict,
204
                           private_encoder=serializer.EncodeWithPrivateFields)
205
    self.assertTrue("egg" in json)
207 206

  
208 207
  def testDictGet(self):
209
    self.assertIs("tar", serializer.PrivateDict().GetPrivate("bar", "tar"),
210
                  "Private.GetPrivate() did not handle the default case")
208
    result = serializer.PrivateDict().GetPrivate("bar", "tar")
209
    self.assertTrue("tar" is result,
210
                    "Private.GetPrivate() did not handle the default case")
211 211

  
212 212
  def testZeronessPrivate(self):
213 213
    self.assertTrue(serializer.Private("foo"),

Also available in: Unified diff