From 7e9dc3fb8ee5ca7763129c2d5190c0f20fbbfcf8 Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Wed, 10 Nov 2010 11:03:57 -0500 Subject: nosetests will only run tests if they are not executable and end in _test.py. --- tests/fw_test.py | 0 tests/kickstart_test/commands_test.py | 0 tests/regex/proxy.py | 112 ---------------------------------- tests/regex/proxy_test.py | 112 ++++++++++++++++++++++++++++++++++ tests/storage_test/action_test.py | 0 tests/storage_test/size_test.py | 0 6 files changed, 112 insertions(+), 112 deletions(-) mode change 100755 => 100644 tests/fw_test.py mode change 100755 => 100644 tests/kickstart_test/commands_test.py delete mode 100755 tests/regex/proxy.py create mode 100755 tests/regex/proxy_test.py mode change 100755 => 100644 tests/storage_test/action_test.py mode change 100755 => 100644 tests/storage_test/size_test.py (limited to 'tests') diff --git a/tests/fw_test.py b/tests/fw_test.py old mode 100755 new mode 100644 diff --git a/tests/kickstart_test/commands_test.py b/tests/kickstart_test/commands_test.py old mode 100755 new mode 100644 diff --git a/tests/regex/proxy.py b/tests/regex/proxy.py deleted file mode 100755 index 8d5596ca8..000000000 --- a/tests/regex/proxy.py +++ /dev/null @@ -1,112 +0,0 @@ -#!/usr/bin/python -import unittest -import re -import traceback - - -class ProxyRegexTestCase(unittest.TestCase): - def testProxy(self): - """ - Run a list of possible proxy= values through the regex and check for - correct results. - - tests are in the form of: (proxy string, match.groups() tuple) - """ - tests = [ ( "proxy.host", - (None, None, None, None, 'proxy.host', None, None) ), - - ( "proxy.host:3128", - (None, None, None, None, 'proxy.host', ':3128', None) ), - - ( "user:password@proxy.host", - (None, 'user:password@', 'user', ':password', 'proxy.host', None, None) ), - - ( "user@proxy.host", - (None, 'user@', 'user', None, 'proxy.host', None, None) ), - - ( "user:password@proxy.host:3128", - (None, 'user:password@', 'user', ':password', 'proxy.host', ':3128', None) ), - - ( "user@proxy.host:3128", - (None, 'user@', 'user', None, 'proxy.host', ':3128', None) ), - - ( "proxy.host/blah/blah", - (None, None, None, None, 'proxy.host', None, '/blah/blah') ), - - ( "proxy.host:3128/blah/blah", - (None, None, None, None, 'proxy.host', ':3128', '/blah/blah') ), - - ( "user:password@proxy.host/blah/blah", - (None, 'user:password@', 'user', ':password', 'proxy.host', None, '/blah/blah') ), - - ( "user@proxy.host/blah/blah", - (None, 'user@', 'user', None, 'proxy.host', None, '/blah/blah') ), - - ( "user:password@proxy.host:3128/blah/blah", - (None, 'user:password@', 'user', ':password', 'proxy.host', ':3128', "/blah/blah") ), - - ( "user@proxy.host:3128/blah/blah", - (None, 'user@', 'user', None, 'proxy.host', ':3128', "/blah/blah") ), - - - - ( "http://proxy.host", - ('http://', None, None, None, 'proxy.host', None, None) ), - - ( "http://proxy.host:3128", - ('http://', None, None, None, 'proxy.host', ':3128', None) ), - - ( "http://user:password@proxy.host", - ('http://', 'user:password@', 'user', ':password', 'proxy.host', None, None) ), - - ( "http://user@proxy.host", - ('http://', 'user@', 'user', None, 'proxy.host', None, None) ), - - ( "http://user:password@proxy.host:3128", - ('http://', 'user:password@', 'user', ':password', 'proxy.host', ':3128', None) ), - - ( "http://user@proxy.host:3128", - ('http://', 'user@', 'user', None, 'proxy.host', ':3128', None) ), - - ( "http://proxy.host/blah/blah", - ('http://', None, None, None, 'proxy.host', None, '/blah/blah') ), - - ( "http://proxy.host:3128/blah/blah", - ('http://', None, None, None, 'proxy.host', ':3128', '/blah/blah') ), - - ( "http://user:password@proxy.host/blah/blah", - ("http://", 'user:password@', 'user', ':password', 'proxy.host', None, '/blah/blah') ), - - ( "http://user@proxy.host/blah/blah", - ("http://", 'user@', 'user', None, 'proxy.host', None, '/blah/blah') ), - - ( "http://user:password@proxy.host:3128/blah/blah", - ("http://", 'user:password@', 'user', ':password', 'proxy.host', ':3128', '/blah/blah') ), - - ( "http://user@proxy.host:3128/blah/blah", - ("http://", 'user@', 'user', None, 'proxy.host', ':3128', '/blah/blah') ), - - ] - - - # This is from yumupdate.py and needs to be updated when it changes - pattern = re.compile("([A-Za-z]+://)?(([A-Za-z0-9]+)(:[^:@]+)?@)?([^:/]+)(:[0-9]+)?(/.*)?") - - got_error = False - for proxy, result in tests: - try: - self.assertEqual(pattern.match(proxy).groups(), result) - except AssertionError as error: - got_error = True - print error - - if got_error: - self.fail() - -def suite(): - return unittest.TestLoader().loadTestsFromTestCase(ProxyRegexTestCase) - - -if __name__ == "__main__": - unittest.main() - diff --git a/tests/regex/proxy_test.py b/tests/regex/proxy_test.py new file mode 100755 index 000000000..8d5596ca8 --- /dev/null +++ b/tests/regex/proxy_test.py @@ -0,0 +1,112 @@ +#!/usr/bin/python +import unittest +import re +import traceback + + +class ProxyRegexTestCase(unittest.TestCase): + def testProxy(self): + """ + Run a list of possible proxy= values through the regex and check for + correct results. + + tests are in the form of: (proxy string, match.groups() tuple) + """ + tests = [ ( "proxy.host", + (None, None, None, None, 'proxy.host', None, None) ), + + ( "proxy.host:3128", + (None, None, None, None, 'proxy.host', ':3128', None) ), + + ( "user:password@proxy.host", + (None, 'user:password@', 'user', ':password', 'proxy.host', None, None) ), + + ( "user@proxy.host", + (None, 'user@', 'user', None, 'proxy.host', None, None) ), + + ( "user:password@proxy.host:3128", + (None, 'user:password@', 'user', ':password', 'proxy.host', ':3128', None) ), + + ( "user@proxy.host:3128", + (None, 'user@', 'user', None, 'proxy.host', ':3128', None) ), + + ( "proxy.host/blah/blah", + (None, None, None, None, 'proxy.host', None, '/blah/blah') ), + + ( "proxy.host:3128/blah/blah", + (None, None, None, None, 'proxy.host', ':3128', '/blah/blah') ), + + ( "user:password@proxy.host/blah/blah", + (None, 'user:password@', 'user', ':password', 'proxy.host', None, '/blah/blah') ), + + ( "user@proxy.host/blah/blah", + (None, 'user@', 'user', None, 'proxy.host', None, '/blah/blah') ), + + ( "user:password@proxy.host:3128/blah/blah", + (None, 'user:password@', 'user', ':password', 'proxy.host', ':3128', "/blah/blah") ), + + ( "user@proxy.host:3128/blah/blah", + (None, 'user@', 'user', None, 'proxy.host', ':3128', "/blah/blah") ), + + + + ( "http://proxy.host", + ('http://', None, None, None, 'proxy.host', None, None) ), + + ( "http://proxy.host:3128", + ('http://', None, None, None, 'proxy.host', ':3128', None) ), + + ( "http://user:password@proxy.host", + ('http://', 'user:password@', 'user', ':password', 'proxy.host', None, None) ), + + ( "http://user@proxy.host", + ('http://', 'user@', 'user', None, 'proxy.host', None, None) ), + + ( "http://user:password@proxy.host:3128", + ('http://', 'user:password@', 'user', ':password', 'proxy.host', ':3128', None) ), + + ( "http://user@proxy.host:3128", + ('http://', 'user@', 'user', None, 'proxy.host', ':3128', None) ), + + ( "http://proxy.host/blah/blah", + ('http://', None, None, None, 'proxy.host', None, '/blah/blah') ), + + ( "http://proxy.host:3128/blah/blah", + ('http://', None, None, None, 'proxy.host', ':3128', '/blah/blah') ), + + ( "http://user:password@proxy.host/blah/blah", + ("http://", 'user:password@', 'user', ':password', 'proxy.host', None, '/blah/blah') ), + + ( "http://user@proxy.host/blah/blah", + ("http://", 'user@', 'user', None, 'proxy.host', None, '/blah/blah') ), + + ( "http://user:password@proxy.host:3128/blah/blah", + ("http://", 'user:password@', 'user', ':password', 'proxy.host', ':3128', '/blah/blah') ), + + ( "http://user@proxy.host:3128/blah/blah", + ("http://", 'user@', 'user', None, 'proxy.host', ':3128', '/blah/blah') ), + + ] + + + # This is from yumupdate.py and needs to be updated when it changes + pattern = re.compile("([A-Za-z]+://)?(([A-Za-z0-9]+)(:[^:@]+)?@)?([^:/]+)(:[0-9]+)?(/.*)?") + + got_error = False + for proxy, result in tests: + try: + self.assertEqual(pattern.match(proxy).groups(), result) + except AssertionError as error: + got_error = True + print error + + if got_error: + self.fail() + +def suite(): + return unittest.TestLoader().loadTestsFromTestCase(ProxyRegexTestCase) + + +if __name__ == "__main__": + unittest.main() + diff --git a/tests/storage_test/action_test.py b/tests/storage_test/action_test.py old mode 100755 new mode 100644 diff --git a/tests/storage_test/size_test.py b/tests/storage_test/size_test.py old mode 100755 new mode 100644 -- cgit