archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Ran 2to3 on unittests, same sort of manual fixups as before

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-03-03 12:07:11 +01:00
parent e0c525389f
commit bced6cae68
16 changed files with 405 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_web/test_utils.py
View File

@@ -1,7 +1,5 @@
# -*- encoding: utf-8 -*-
from __future__ import absolute_import
import unittest
import datetime
@@ -13,20 +11,20 @@ class IsValidIdTest(unittest.TestCase):
def test_valid(self):
# 24-byte hex strings
self.assertTrue(utils.is_valid_id(24 * 'a'))
self.assertTrue(utils.is_valid_id(24 * u'a'))
self.assertTrue(utils.is_valid_id(24 * 'a'))
self.assertTrue(utils.is_valid_id('deadbeefbeefcacedeadcace'))
self.assertTrue(utils.is_valid_id('deadbeefbeefcacedeadcace'))
self.assertTrue(utils.is_valid_id(u'deadbeefbeefcacedeadcace'))
# 12-byte arbitrary ASCII strings
self.assertTrue(utils.is_valid_id('DeadBeefCake'))
self.assertTrue(utils.is_valid_id(u'DeadBeefCake'))
self.assertTrue(utils.is_valid_id('DeadBeefCake'))
# 12-byte str object
self.assertTrue(utils.is_valid_id('beef€67890'))
def test_bad_length(self):
self.assertFalse(utils.is_valid_id(23 * 'a'))
self.assertFalse(utils.is_valid_id(25 * u'a'))
self.assertFalse(utils.is_valid_id(25 * 'a'))
def test_non_string(self):
self.assertFalse(utils.is_valid_id(None))
@@ -38,7 +36,7 @@ class IsValidIdTest(unittest.TestCase):
self.assertFalse(utils.is_valid_id('deadbeefbeefcakedeadcake'))
# unicode variant of valid 12-byte str object
self.assertFalse(utils.is_valid_id(u'beef€67890'))
self.assertFalse(utils.is_valid_id('beef€67890'))
class PrettyDateTest(unittest.TestCase):