Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 13:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 44571696245f (bug 1184067) for breaking web-platform-tests.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-07-17 11:54:27 -04:00
parent 1c6488ef45
commit ba45b91fde
2 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testing/mozbase/mozinfo/mozinfo/mozinfo.py
View File

@ -14,16 +14,10 @@ import os
import platform
import re
import sys
from distutils.version import LooseVersion
# keep a copy of the os module since updating globals overrides this
_os = os
# StringVersion is our public name
StringVersion = LooseVersion
class unknown(object):
"""marker class for unknown information"""
def __nonzero__(self):
@ -81,7 +75,7 @@ else:
os_version = version = unknown
info['version'] = version
info['os_version'] = StringVersion(os_version)
info['os_version'] = os_version
# processor type and bits
if processor in ["i386", "i686"]:
@ -200,7 +194,6 @@ __all__ += [
'choices',
'update',
'find_and_update_from_json',
'StringVersion',
]
def main(args=None):

25
testing/mozbase/mozinfo/tests/test.py
View File

@ -84,30 +84,5 @@ class TestMozinfo(unittest.TestCase):
self.assertEqual(mozinfo.find_and_update_from_json(), j)
self.assertEqual(mozinfo.info["foo"], "123456")
class TestStringVersion(unittest.TestCase):
def test_os_version_is_a_StringVersion(self):
self.assertIsInstance(mozinfo.os_version, mozinfo.StringVersion)
def test_compare_to_string(self):
version = mozinfo.StringVersion('10.10')
self.assertGreater(version, '10.2')
self.assertGreater('11', version)
self.assertGreaterEqual(version, '10.10')
self.assertGreaterEqual('10.11', version)
self.assertEqual(version, '10.10')
self.assertEqual('10.10', version)
self.assertNotEqual(version, '10.2')
self.assertNotEqual('11', version)
self.assertLess(version, '11.8.5')
self.assertLess('10.2', version)
self.assertLessEqual(version, '11')
self.assertLessEqual('10.10', version)
def test_to_string(self):
self.assertEqual('10.10', str(mozinfo.StringVersion('10.10')))
if __name__ == '__main__':
unittest.main()