summaryrefslogtreecommitdiff
path: root/tests/utils
diff options
context:
space:
mode:
Diffstat (limited to 'tests/utils')
-rw-r--r--tests/utils/__init__.py3
-rw-r--r--tests/utils/test_file_util.py7
-rw-r--r--tests/utils/test_flexible_version.py477
-rw-r--r--tests/utils/test_rest_util.py15
-rw-r--r--tests/utils/test_shell_util.py10
-rw-r--r--tests/utils/test_text_util.py9
6 files changed, 494 insertions, 27 deletions
diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py
index 9bdb27e..2ef4c16 100644
--- a/tests/utils/__init__.py
+++ b/tests/utils/__init__.py
@@ -14,6 +14,3 @@
#
# Requires Python 2.4+ and Openssl 1.0+
#
-# Implements parts of RFC 2131, 1541, 1497 and
-# http://msdn.microsoft.com/en-us/library/cc227282%28PROT.10%29.aspx
-# http://msdn.microsoft.com/en-us/library/cc227259%28PROT.13%29.aspx
diff --git a/tests/utils/test_file_util.py b/tests/utils/test_file_util.py
index bf7c638..9a5479e 100644
--- a/tests/utils/test_file_util.py
+++ b/tests/utils/test_file_util.py
@@ -14,17 +14,14 @@
#
# Requires Python 2.4+ and Openssl 1.0+
#
-# Implements parts of RFC 2131, 1541, 1497 and
-# http://msdn.microsoft.com/en-us/library/cc227282%28PROT.10%29.aspx
-# http://msdn.microsoft.com/en-us/library/cc227259%28PROT.13%29.aspx
from tests.tools import *
import uuid
import unittest
import os
import sys
-from azurelinuxagent.future import ustr
-import azurelinuxagent.utils.fileutil as fileutil
+from azurelinuxagent.common.future import ustr
+import azurelinuxagent.common.utils.fileutil as fileutil
class TestFileOperations(AgentTestCase):
def test_read_write_file(self):
diff --git a/tests/utils/test_flexible_version.py b/tests/utils/test_flexible_version.py
new file mode 100644
index 0000000..1162022
--- /dev/null
+++ b/tests/utils/test_flexible_version.py
@@ -0,0 +1,477 @@
+import random
+import re
+import unittest
+
+from azurelinuxagent.common.utils.flexible_version import FlexibleVersion
+
+class TestFlexibleVersion(unittest.TestCase):
+
+ def setUp(self):
+ self.v = FlexibleVersion()
+
+ def test_compile_separator(self):
+ tests = [
+ '.',
+ '',
+ '-'
+ ]
+ for t in tests:
+ t_escaped = re.escape(t)
+ t_re = re.compile(t_escaped)
+ self.assertEqual((t_escaped, t_re), self.v._compile_separator(t))
+ self.assertEqual(('', re.compile('')), self.v._compile_separator(None))
+ return
+
+ def test_compile_pattern(self):
+ self.v._compile_pattern()
+ tests = {
+ '1': True,
+ '1.2': True,
+ '1.2.3': True,
+ '1.2.3.4': True,
+ '1.2.3.4.5': True,
+
+ '1alpha': True,
+ '1.alpha': True,
+ '1-alpha': True,
+ '1alpha0': True,
+ '1.alpha0': True,
+ '1-alpha0': True,
+ '1.2alpha': True,
+ '1.2.alpha': True,
+ '1.2-alpha': True,
+ '1.2alpha0': True,
+ '1.2.alpha0': True,
+ '1.2-alpha0': True,
+
+ '1beta': True,
+ '1.beta': True,
+ '1-beta': True,
+ '1beta0': True,
+ '1.beta0': True,
+ '1-beta0': True,
+ '1.2beta': True,
+ '1.2.beta': True,
+ '1.2-beta': True,
+ '1.2beta0': True,
+ '1.2.beta0': True,
+ '1.2-beta0': True,
+
+ '1rc': True,
+ '1.rc': True,
+ '1-rc': True,
+ '1rc0': True,
+ '1.rc0': True,
+ '1-rc0': True,
+ '1.2rc': True,
+ '1.2.rc': True,
+ '1.2-rc': True,
+ '1.2rc0': True,
+ '1.2.rc0': True,
+ '1.2-rc0': True,
+
+ '1.2.3.4alpha5': True,
+
+ ' 1': False,
+ 'beta': False,
+ '1delta0': False,
+ '': False
+ }
+ for test in iter(tests):
+ expectation = tests[test]
+ self.assertEqual(
+ expectation,
+ self.v.version_re.match(test) is not None,
+ "test: {0} expected: {1} ".format(test, expectation))
+ return
+
+ def test_compile_pattern_sep(self):
+ self.v.sep = '-'
+ self.v._compile_pattern()
+ tests = {
+ '1': True,
+ '1-2': True,
+ '1-2-3': True,
+ '1-2-3-4': True,
+ '1-2-3-4-5': True,
+
+ '1alpha': True,
+ '1-alpha': True,
+ '1-alpha': True,
+ '1alpha0': True,
+ '1-alpha0': True,
+ '1-alpha0': True,
+ '1-2alpha': True,
+ '1-2.alpha': True,
+ '1-2-alpha': True,
+ '1-2alpha0': True,
+ '1-2.alpha0': True,
+ '1-2-alpha0': True,
+
+ '1beta': True,
+ '1-beta': True,
+ '1-beta': True,
+ '1beta0': True,
+ '1-beta0': True,
+ '1-beta0': True,
+ '1-2beta': True,
+ '1-2.beta': True,
+ '1-2-beta': True,
+ '1-2beta0': True,
+ '1-2.beta0': True,
+ '1-2-beta0': True,
+
+ '1rc': True,
+ '1-rc': True,
+ '1-rc': True,
+ '1rc0': True,
+ '1-rc0': True,
+ '1-rc0': True,
+ '1-2rc': True,
+ '1-2.rc': True,
+ '1-2-rc': True,
+ '1-2rc0': True,
+ '1-2.rc0': True,
+ '1-2-rc0': True,
+
+ '1-2-3-4alpha5': True,
+
+ ' 1': False,
+ 'beta': False,
+ '1delta0': False,
+ '': False
+ }
+ for test in iter(tests):
+ expectation = tests[test]
+ self.assertEqual(
+ expectation,
+ self.v.version_re.match(test) is not None,
+ "test: {0} expected: {1} ".format(test, expectation))
+ return
+
+ def test_compile_pattern_prerel(self):
+ self.v.prerel_tags = ('a', 'b', 'c')
+ self.v._compile_pattern()
+ tests = {
+ '1': True,
+ '1.2': True,
+ '1.2.3': True,
+ '1.2.3.4': True,
+ '1.2.3.4.5': True,
+
+ '1a': True,
+ '1.a': True,
+ '1-a': True,
+ '1a0': True,
+ '1.a0': True,
+ '1-a0': True,
+ '1.2a': True,
+ '1.2.a': True,
+ '1.2-a': True,
+ '1.2a0': True,
+ '1.2.a0': True,
+ '1.2-a0': True,
+
+ '1b': True,
+ '1.b': True,
+ '1-b': True,
+ '1b0': True,
+ '1.b0': True,
+ '1-b0': True,
+ '1.2b': True,
+ '1.2.b': True,
+ '1.2-b': True,
+ '1.2b0': True,
+ '1.2.b0': True,
+ '1.2-b0': True,
+
+ '1c': True,
+ '1.c': True,
+ '1-c': True,
+ '1c0': True,
+ '1.c0': True,
+ '1-c0': True,
+ '1.2c': True,
+ '1.2.c': True,
+ '1.2-c': True,
+ '1.2c0': True,
+ '1.2.c0': True,
+ '1.2-c0': True,
+
+ '1.2.3.4a5': True,
+
+ ' 1': False,
+ '1.2.3.4alpha5': False,
+ 'beta': False,
+ '1delta0': False,
+ '': False
+ }
+ for test in iter(tests):
+ expectation = tests[test]
+ self.assertEqual(
+ expectation,
+ self.v.version_re.match(test) is not None,
+ "test: {0} expected: {1} ".format(test, expectation))
+ return
+
+ def test_ensure_compatible_separators(self):
+ v1 = FlexibleVersion('1.2.3')
+ v2 = FlexibleVersion('1-2-3', sep='-')
+ try:
+ v1 == v2
+ self.assertTrue(False, "Incompatible separators failed to raise an exception")
+ except ValueError:
+ pass
+ except Exception as e:
+ t = e.__class__.__name__
+ self.assertTrue(False, "Incompatible separators raised an unexpected exception: {0}" \
+ .format(t))
+ return
+
+ def test_ensure_compatible_prerel(self):
+ v1 = FlexibleVersion('1.2.3', prerel_tags=('alpha', 'beta', 'rc'))
+ v2 = FlexibleVersion('1.2.3', prerel_tags=('a', 'b', 'c'))
+ try:
+ v1 == v2
+ self.assertTrue(False, "Incompatible prerel_tags failed to raise an exception")
+ except ValueError:
+ pass
+ except Exception as e:
+ t = e.__class__.__name__
+ self.assertTrue(False, "Incompatible prerel_tags raised an unexpected exception: {0}" \
+ .format(t))
+ return
+
+ def test_ensure_compatible_prerel_length(self):
+ v1 = FlexibleVersion('1.2.3', prerel_tags=('a', 'b', 'c'))
+ v2 = FlexibleVersion('1.2.3', prerel_tags=('a', 'b'))
+ try:
+ v1 == v2
+ self.assertTrue(False, "Incompatible prerel_tags failed to raise an exception")
+ except ValueError:
+ pass
+ except Exception as e:
+ t = e.__class__.__name__
+ self.assertTrue(False, "Incompatible prerel_tags raised an unexpected exception: {0}" \
+ .format(t))
+ return
+
+ def test_ensure_compatible_prerel_order(self):
+ v1 = FlexibleVersion('1.2.3', prerel_tags=('a', 'b'))
+ v2 = FlexibleVersion('1.2.3', prerel_tags=('b', 'a'))
+ try:
+ v1 == v2
+ self.assertTrue(False, "Incompatible prerel_tags failed to raise an exception")
+ except ValueError:
+ pass
+ except Exception as e:
+ t = e.__class__.__name__
+ self.assertTrue(False, "Incompatible prerel_tags raised an unexpected exception: {0}" \
+ .format(t))
+ return
+
+ def test_major(self):
+ tests = {
+ '1' : 1,
+ '1.2' : 1,
+ '1.2.3' : 1,
+ '1.2.3.4' : 1
+ }
+ for test in iter(tests):
+ expectation = tests[test]
+ self.assertEqual(
+ expectation,
+ FlexibleVersion(test).major)
+ return
+
+ def test_minor(self):
+ tests = {
+ '1' : 0,
+ '1.2' : 2,
+ '1.2.3' : 2,
+ '1.2.3.4' : 2
+ }
+ for test in iter(tests):
+ expectation = tests[test]
+ self.assertEqual(
+ expectation,
+ FlexibleVersion(test).minor)
+ return
+
+ def test_patch(self):
+ tests = {
+ '1' : 0,
+ '1.2' : 0,
+ '1.2.3' : 3,
+ '1.2.3.4' : 3
+ }
+ for test in iter(tests):
+ expectation = tests[test]
+ self.assertEqual(
+ expectation,
+ FlexibleVersion(test).patch)
+ return
+
+ def test_parse(self):
+ tests = {
+ "1.2.3.4": ((1, 2, 3, 4), None),
+ "1.2.3.4alpha5": ((1, 2, 3, 4), ('alpha', 5)),
+ "1.2.3.4-alpha5": ((1, 2, 3, 4), ('alpha', 5)),
+ "1.2.3.4.alpha5": ((1, 2, 3, 4), ('alpha', 5))
+ }
+ for test in iter(tests):
+ expectation = tests[test]
+ self.v._parse(test)
+ self.assertEqual(expectation, (self.v.version, self.v.prerelease))
+ return
+
+ def test_decrement(self):
+ src_v = FlexibleVersion('1.0.0.0.10')
+ dst_v = FlexibleVersion(str(src_v))
+ for i in range(1,10):
+ dst_v -= 1
+ self.assertEqual(i, src_v.version[-1] - dst_v.version[-1])
+ return
+
+ def test_decrement_disallows_below_zero(self):
+ try:
+ FlexibleVersion('1.0') - 1
+ self.assertTrue(False, "Decrement failed to raise an exception")
+ except ArithmeticError:
+ pass
+ except Exception as e:
+ t = e.__class__.__name__
+ self.assertTrue(False, "Decrement raised an unexpected exception: {0}".format(t))
+ return
+
+ def test_increment(self):
+ src_v = FlexibleVersion('1.0.0.0.0')
+ dst_v = FlexibleVersion(str(src_v))
+ for i in range(1,10):
+ dst_v += 1
+ self.assertEqual(i, dst_v.version[-1] - src_v.version[-1])
+ return
+
+ def test_str(self):
+ tests = [
+ '1',
+ '1.2',
+ '1.2.3',
+ '1.2.3.4',
+ '1.2.3.4.5',
+
+ '1alpha',
+ '1.alpha',
+ '1-alpha',
+ '1alpha0',
+ '1.alpha0',
+ '1-alpha0',
+ '1.2alpha',
+ '1.2.alpha',
+ '1.2-alpha',
+ '1.2alpha0',
+ '1.2.alpha0',
+ '1.2-alpha0',
+
+ '1beta',
+ '1.beta',
+ '1-beta',
+ '1beta0',
+ '1.beta0',
+ '1-beta0',
+ '1.2beta',
+ '1.2.beta',
+ '1.2-beta',
+ '1.2beta0',
+ '1.2.beta0',
+ '1.2-beta0',
+
+ '1rc',
+ '1.rc',
+ '1-rc',
+ '1rc0',
+ '1.rc0',
+ '1-rc0',
+ '1.2rc',
+ '1.2.rc',
+ '1.2-rc',
+ '1.2rc0',
+ '1.2.rc0',
+ '1.2-rc0',
+
+ '1.2.3.4alpha5',
+ ]
+ for test in tests:
+ self.assertEqual(test, str(FlexibleVersion(test)))
+ return
+
+ def test_repr(self):
+ v = FlexibleVersion('1,2,3rc4', ',', ['lol', 'rc'])
+ expected = "FlexibleVersion ('1,2,3rc4', ',', ('lol', 'rc'))"
+ self.assertEqual(expected, repr(v))
+
+ def test_order(self):
+ test0 = ["1.7.0", "1.7.0rc0", "1.11.0"]
+ expected0 = ['1.7.0rc0', '1.7.0', '1.11.0']
+ self.assertEqual(expected0, list(map(str, sorted([FlexibleVersion(v) for v in test0]))))
+
+ test1 = [
+ '2.0.2rc2',
+ '2.2.0beta3',
+ '2.0.10',
+ '2.1.0alpha42',
+ '2.0.2beta4',
+ '2.1.1',
+ '2.0.1',
+ '2.0.2rc3',
+ '2.2.0',
+ '2.0.0',
+ '3.0.1',
+ '2.1.0rc1'
+ ]
+ expected1 = [
+ '2.0.0',
+ '2.0.1',
+ '2.0.2beta4',
+ '2.0.2rc2',
+ '2.0.2rc3',
+ '2.0.10',
+ '2.1.0alpha42',
+ '2.1.0rc1',
+ '2.1.1',
+ '2.2.0beta3',
+ '2.2.0',
+ '3.0.1'
+ ]
+ self.assertEqual(expected1, list(map(str, sorted([FlexibleVersion(v) for v in test1]))))
+
+ self.assertEqual(FlexibleVersion("1.0.0.0.0.0.0.0"), FlexibleVersion("1"))
+
+ self.assertFalse(FlexibleVersion("1.0") > FlexibleVersion("1.0"))
+ self.assertFalse(FlexibleVersion("1.0") < FlexibleVersion("1.0"))
+
+ self.assertTrue(FlexibleVersion("1.0") < FlexibleVersion("1.1"))
+ self.assertTrue(FlexibleVersion("1.9") < FlexibleVersion("1.10"))
+ self.assertTrue(FlexibleVersion("1.9.9") < FlexibleVersion("1.10.0"))
+ self.assertTrue(FlexibleVersion("1.0.0.0") < FlexibleVersion("1.2.0.0"))
+
+ self.assertTrue(FlexibleVersion("1.1") > FlexibleVersion("1.0"))
+ self.assertTrue(FlexibleVersion("1.10") > FlexibleVersion("1.9"))
+ self.assertTrue(FlexibleVersion("1.10.0") > FlexibleVersion("1.9.9"))
+ self.assertTrue(FlexibleVersion("1.2.0.0") > FlexibleVersion("1.0.0.0"))
+
+ self.assertTrue(FlexibleVersion("1.0") <= FlexibleVersion("1.1"))
+ self.assertTrue(FlexibleVersion("1.1") > FlexibleVersion("1.0"))
+ self.assertTrue(FlexibleVersion("1.1") >= FlexibleVersion("1.0"))
+
+ self.assertTrue(FlexibleVersion("1.0") == FlexibleVersion("1.0"))
+ self.assertTrue(FlexibleVersion("1.0") >= FlexibleVersion("1.0"))
+ self.assertTrue(FlexibleVersion("1.0") <= FlexibleVersion("1.0"))
+
+ self.assertFalse(FlexibleVersion("1.0") != FlexibleVersion("1.0"))
+ self.assertTrue(FlexibleVersion("1.1") != FlexibleVersion("1.0"))
+ return
+
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/tests/utils/test_rest_util.py b/tests/utils/test_rest_util.py
index bd22c55..874e527 100644
--- a/tests/utils/test_rest_util.py
+++ b/tests/utils/test_rest_util.py
@@ -14,17 +14,14 @@
#
# Requires Python 2.4+ and Openssl 1.0+
#
-# Implements parts of RFC 2131, 1541, 1497 and
-# http://msdn.microsoft.com/en-us/library/cc227282%28PROT.10%29.aspx
-# http://msdn.microsoft.com/en-us/library/cc227259%28PROT.13%29.aspx
from tests.tools import AgentTestCase, patch, Mock, MagicMock
import uuid
import unittest
import os
-import azurelinuxagent.utils.restutil as restutil
-from azurelinuxagent.future import ustr, httpclient
-import azurelinuxagent.logger as logger
+import azurelinuxagent.common.utils.restutil as restutil
+from azurelinuxagent.common.future import ustr, httpclient
+import azurelinuxagent.common.logger as logger
class TestHttpOperations(AgentTestCase):
@@ -57,8 +54,8 @@ class TestHttpOperations(AgentTestCase):
self.assertEquals(rel_uri, "None")
- @patch("azurelinuxagent.future.httpclient.HTTPSConnection")
- @patch("azurelinuxagent.future.httpclient.HTTPConnection")
+ @patch("azurelinuxagent.common.future.httpclient.HTTPSConnection")
+ @patch("azurelinuxagent.common.future.httpclient.HTTPConnection")
def test_http_request(self, HTTPConnection, HTTPSConnection):
mock_httpconn = MagicMock()
mock_httpresp = MagicMock()
@@ -98,7 +95,7 @@ class TestHttpOperations(AgentTestCase):
self.assertEquals("_(:3| <)_", resp.read())
@patch("time.sleep")
- @patch("azurelinuxagent.utils.restutil._http_request")
+ @patch("azurelinuxagent.common.utils.restutil._http_request")
def test_http_request_with_retry(self, _http_request, sleep):
mock_httpresp = MagicMock()
mock_httpresp.read = Mock(return_value="hehe")
diff --git a/tests/utils/test_shell_util.py b/tests/utils/test_shell_util.py
index aa89121..57e6c33 100644
--- a/tests/utils/test_shell_util.py
+++ b/tests/utils/test_shell_util.py
@@ -15,15 +15,12 @@
#
# Requires Python 2.4+ and Openssl 1.0+
#
-# Implements parts of RFC 2131, 1541, 1497 and
-# http://msdn.microsoft.com/en-us/library/cc227282%28PROT.10%29.aspx
-# http://msdn.microsoft.com/en-us/library/cc227259%28PROT.13%29.aspx
from tests.tools import *
import uuid
import unittest
import os
-import azurelinuxagent.utils.shellutil as shellutil
+import azurelinuxagent.common.utils.shellutil as shellutil
import test
class TestrunCmd(AgentTestCase):
@@ -38,5 +35,10 @@ class TestrunCmd(AgentTestCase):
err = shellutil.run_get_output(u"ls 我")
self.assertNotEquals(0, err[0])
+ def test_shellquote(self):
+ self.assertEqual("\'foo\'", shellutil.quote("foo"))
+ self.assertEqual("\'foo bar\'", shellutil.quote("foo bar"))
+ self.assertEqual("'foo'\\''bar'", shellutil.quote("foo\'bar"))
+
if __name__ == '__main__':
unittest.main()
diff --git a/tests/utils/test_text_util.py b/tests/utils/test_text_util.py
index 0e8cc7d..9ac0707 100644
--- a/tests/utils/test_text_util.py
+++ b/tests/utils/test_text_util.py
@@ -14,17 +14,14 @@
#
# Requires Python 2.4+ and Openssl 1.0+
#
-# Implements parts of RFC 2131, 1541, 1497 and
-# http://msdn.microsoft.com/en-us/library/cc227282%28PROT.10%29.aspx
-# http://msdn.microsoft.com/en-us/library/cc227259%28PROT.13%29.aspx
from tests.tools import *
import uuid
import unittest
import os
-from azurelinuxagent.future import ustr
-import azurelinuxagent.utils.textutil as textutil
-from azurelinuxagent.utils.textutil import Version
+from azurelinuxagent.common.future import ustr
+import azurelinuxagent.common.utils.textutil as textutil
+from azurelinuxagent.common.utils.textutil import Version
class TestTextUtil(AgentTestCase):
def test_get_password_hash(self):
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 05:14:46 +0000