[tor-commits] [bridgedb/master] Add unittests for bridgedb.configure module.

[isis@xxxxxxxxxxxxxx]

commit d24f778c9115c9fce54a686774211fd5f40c47ec
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Wed Aug 27 08:37:27 2014 +0000

    Add unittests for bridgedb.configure module.
---
 lib/bridgedb/configure.py           |    2 +-
 lib/bridgedb/test/test_configure.py |   67 +++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py
index 6220fce..33cc458 100644
--- a/lib/bridgedb/configure.py
+++ b/lib/bridgedb/configure.py
@@ -93,7 +93,7 @@ def loadConfig(configFile=None, configCls=None):
 
     for attr in ["PROXY_LIST_FILES", "BRIDGE_FILES", "EXTRA_INFO_FILES"]:
         setting = getattr(config, attr, None)
-        if setting is None:
+        if setting is None:  # pragma: no cover
             setattr(config, attr, []) # If they weren't set, make them lists
         else:
             setattr(config, attr, # If they were set, expand the paths:
diff --git a/lib/bridgedb/test/test_configure.py b/lib/bridgedb/test/test_configure.py
new file mode 100644
index 0000000..501ed1f
--- /dev/null
+++ b/lib/bridgedb/test/test_configure.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of BridgeDB, a Tor bridge distribution system.
+#
+# :authors: please see the AUTHORS file for attributions
+# :copyright: (c) 2013-2014, Isis Lovecruft
+#             (c) 2007-2014, The Tor Project, Inc.
+# :license: see LICENSE for licensing information
+
+"""Tests for :mod:`bridgedb.configure`."""
+
+from __future__ import print_function
+
+import os
+
+from twisted.trial import unittest
+
+from bridgedb import configure
+
+
+class ConfigureTests(unittest.TestCase):
+    """Tests for miscelaneous functions in :mod:`bridgedb.configure`."""
+
+    def setUp(self):
+        """Find the config file in the top directory of this repo."""
+        here = os.getcwd()
+        topdir = here.rstrip('_trial_temp')
+        self.configFilename = os.path.join(topdir, 'bridgedb.conf')
+
+    def test_loadConfig_with_file(self):
+        """We should be able to load and parse the standard ``bridgedb.conf``
+        file from the top directory of this repository.
+        """
+        config = configure.loadConfig(self.configFilename)
+        self.assertTrue(config)
+
+    def test_loadConfig_with_file_and_class(self):
+        """We should be able to reload and parse the ``bridgedb.conf``
+        file, if we have a config class as well.
+        """
+        config = configure.loadConfig(self.configFilename)
+        newConfig = configure.loadConfig(self.configFilename, configCls=config)
+        self.assertTrue(newConfig)
+
+    def test_loadConfig_with_class(self):
+        """We should be able to recreate a config, given its class."""
+        config = configure.loadConfig(self.configFilename)
+        newConfig = configure.loadConfig(configCls=config)
+        self.assertTrue(newConfig)
+
+    def test_loadConfig_set_EXTRA_INFO_FILES_when_None(self):
+        """If certain options, like the ``EXTRA_INFO_FILES`` option in the
+        config file weren't set, they should be made into lists so that our
+        parsers don't choke on them later.
+        """
+        config = configure.loadConfig(self.configFilename)
+        setattr(config, "EXTRA_INFO_FILES", None)
+        self.assertTrue(config.EXTRA_INFO_FILES is None)
+        newConfig = configure.loadConfig(configCls=config)
+        self.assertIsInstance(newConfig.EXTRA_INFO_FILES, list)
+
+    def test_loadConfig_returns_Conf(self):
+        """After loading and parsing the ``bridgedb.conf`` file, we should have
+        a :class:`bridgedb.configure.Conf`.
+        """
+        config = configure.loadConfig(self.configFilename)
+        self.assertIsInstance(config, configure.Conf)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits