diff --git a/python/tests/__init__.py b/python/tests/__init__.py index 9362c36e..e69de29b 100644 --- a/python/tests/__init__.py +++ b/python/tests/__init__.py @@ -1 +0,0 @@ -__author__ = 'RomanovDA' diff --git a/python/tests/test_argparse.py b/python/tests/test_argparse.py deleted file mode 100644 index 943f1a77..00000000 --- a/python/tests/test_argparse.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'Dmitry' diff --git a/python/tests/test_authentication.py b/python/tests/test_authentication.py index a4fe03eb..e606a856 100644 --- a/python/tests/test_authentication.py +++ b/python/tests/test_authentication.py @@ -1,11 +1,10 @@ import unittest import os from ccdb import get_ccdb_home_path - from ccdb.authentication import EnvironmentAuthentication - from ccdb import AlchemyProvider + class AuthenticationTest(unittest.TestCase): def setUp(self): @@ -15,12 +14,13 @@ def setUp(self): self.mysql_connection_str = "mysql://ccdb_user@127.0.0.1:3306/ccdb" self.provider = AlchemyProvider() - def test_environment_auth(self): self.provider.connect(self.sqlite_connection_str) - if "CCDB_USER" in os.environ: del os.environ["CCDB_USER"] - if "USER" in os.environ: del os.environ["USER"] + if "CCDB_USER" in os.environ: + del os.environ["CCDB_USER"] + if "USER" in os.environ: + del os.environ["USER"] os.environ["CCDB_USER"] = "test_user" diff --git a/python/tests/test_console_context.py b/python/tests/test_console_context.py index 228558e7..598cc3ef 100644 --- a/python/tests/test_console_context.py +++ b/python/tests/test_console_context.py @@ -31,11 +31,11 @@ def setUp(self): self.sqlite_connection_str = "sqlite:///" + os.path.join(ccdb_path, "sql", "ccdb.sqlite") self.mysql_connection_str = "mysql://ccdb_user@127.0.0.1:3306/ccdb" - #initialize but disable colorama + # initialize but disable colorama ccdb.cmd.colorama.init(autoreset=True) ccdb.cmd.colorama.deinit() - #create console context + # create console context self.context = ConsoleContext() self.context.silent_exceptions = False self.context.theme = ccdb.cmd.themes.NoColorTheme() @@ -43,29 +43,25 @@ def setUp(self): self.context.user_name = "python_tests" self.context.register_utilities() - #save stdout + # save stdout self.output = StringIO() self.saved_stdout = sys.stdout sys.stdout = self.output - #logger + # logger ch = logging.StreamHandler() ch.stream = self.output logger.addHandler(ch) logger.setLevel(logging.INFO) - - def tearDown(self): - #restore stdout + # restore stdout sys.stdout = self.saved_stdout - def test_context(self): """Test utils are loaded""" self.assertTrue(len(self.context.utils)>0) - def test_cat(self): """cat. General help""" self.context.process_command_line("cat /test/test_vars/test_table") diff --git a/python/tests/test_path_utils.py b/python/tests/test_path_utils.py index c630100d..559af02d 100644 --- a/python/tests/test_path_utils.py +++ b/python/tests/test_path_utils.py @@ -1,23 +1,21 @@ - import unittest + import ccdb.path_utils class AuthenticationTest(unittest.TestCase): - def test_parse_time(self): - #test of simple parse + # test of simple parse dt = ccdb.path_utils.parse_time("2012-11x13_12-37:55") # set different symbols as separators self.assertEqual(dt.strftime("%Y-%m-%d_%H-%M-%S"), "2012-11-13_12-37-55") - #test of non full parse + # test of non full parse dt = ccdb.path_utils.parse_time("2012-11x13") # set different symbols as separators self.assertEqual(dt.strftime("%Y-%m-%d_%H-%M-%S"), "2012-11-13_23-59-59") - def test_full_parse_request(self): - #test full request + # test full request result = ccdb.path_utils.parse_request("/test/test_vars/test_table:100:mc:2012-11-13_12:37:55") self.assertTrue(result.path_is_parsed) self.assertEqual(result.path, "/test/test_vars/test_table") @@ -29,9 +27,8 @@ def test_full_parse_request(self): self.assertEqual(result.time_str, "2012-11-13_12:37:55") self.assertEqual(result.time.strftime("%Y-%m-%d_%H-%M-%S"), "2012-11-13_12-37-55") - def test_partial1_parse_request(self): - #test full request + # test full request result = ccdb.path_utils.parse_request("/test/test_vars/test_table") self.assertTrue(result.path_is_parsed) self.assertEqual(result.path, "/test/test_vars/test_table") @@ -39,9 +36,8 @@ def test_partial1_parse_request(self): self.assertFalse(result.variation_is_parsed) self.assertFalse(result.time_is_parsed) - def test_partial2_parse_request(self): - #test full request + # test full request result = ccdb.path_utils.parse_request("/test/test_vars/test_table::mc") self.assertTrue(result.path_is_parsed) self.assertEqual(result.path, "/test/test_vars/test_table") @@ -50,7 +46,6 @@ def test_partial2_parse_request(self): self.assertEqual(result.variation, "mc") self.assertFalse(result.time_is_parsed) - def test_validate_name(self): """ Checks if name is valid ccdb object name """ self.assertTrue(ccdb.path_utils.validate_name("this_is_variation2")) diff --git a/python/tests/test_provider.py b/python/tests/test_provider.py index db64daf5..3db92a02 100644 --- a/python/tests/test_provider.py +++ b/python/tests/test_provider.py @@ -5,7 +5,6 @@ class SQLiteAlchemyProviderTest(AlchemyProviderTest): - def setUp(self): AlchemyProviderTest.setUp(self) self.connection_str = "sqlite:///" + os.path.join(self.ccdb_path, "sql", "ccdb.sqlite") @@ -17,7 +16,6 @@ def test_sqlite_wrong_file(self): class MySQLAlchemyProviderTest(AlchemyProviderTest): - def setUp(self): AlchemyProviderTest.setUp(self) self.connection_str = "mysql://ccdb_user@127.0.0.1:3306/ccdb"