Merge branch 'options-unit-tests' of https://github.com/stpierre/bcfg2

* 'options-unit-tests' of https://github.com/stpierre/bcfg2:
  Options: Fixed non-path database name parsing
  Options: further command registry fixes
  Options: gather as much data from config file first
  Options: fix path canonicalization and file-like objects
  testsuite: unlink temporary files
  Options: ensure <repository> macros are always fixed up
  DBSettings: fix up <repository> in database name
  testsuite: better debug capturing for options tests
  call shutdown on subcommand registries
  fixed some places where plugin loading should fail silently
  testsuite: Added unit tests for new option parsing
  testsuite: capture stderr by default
  Test failure to parse config file when bcfg2.conf exists
  testsuite: skip nested exclusive option group test on py2.6
  testsuite: Added unit tests for new option parsing

3 files changed, 15 insertions, 8 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py
index 48304d26e..f26d6ba18 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py
@@ -383,10 +383,10 @@ class CLI(Bcfg2.Options.CommandRegistry):
 
     def __init__(self):
         Bcfg2.Options.CommandRegistry.__init__(self)
-        Bcfg2.Options.register_commands(self.__class__, globals().values(),
-                                        parent=HelperSubcommand)
+        self.register_commands(globals().values(), parent=HelperSubcommand)
         parser = Bcfg2.Options.get_parser("Bcfg2 yum helper",
                                           components=[self])
+        parser.add_options(self.subcommand_options)
         parser.parse()
         self.logger = logging.getLogger(parser.prog)
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index d11ac60fe..cb533f4f1 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -33,6 +33,7 @@ class PackagesBackendAction(Bcfg2.Options.ComponentAction):
     """ ComponentAction to load Packages backends """
     bases = ['Bcfg2.Server.Plugins.Packages']
     module = True
+    fail_silently = True
 
 
 class OnDemandDict(MutableMapping):
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py
index b752650f0..2ca518e53 100644
--- a/src/lib/Bcfg2/Server/Plugins/Svn.py
+++ b/src/lib/Bcfg2/Server/Plugins/Svn.py
@@ -18,12 +18,6 @@ class Svn(Bcfg2.Server.Plugin.Version):
     """Svn is a version plugin for dealing with Bcfg2 repos."""
     options = Bcfg2.Server.Plugin.Version.options + [
         Bcfg2.Options.Option(
-            cf=("svn", "conflict_resolution"), dest="svn_conflict_resolution",
-            type=lambda v: v.replace("-", "_"),
-            choices=dir(pysvn.wc_conflict_choice),  # pylint: disable=E1101
-            default=pysvn.wc_conflict_choice.postpone,  # pylint: disable=E1101
-            help="SVN conflict resolution method"),
-        Bcfg2.Options.Option(
             cf=("svn", "user"), dest="svn_user", help="SVN username"),
         Bcfg2.Options.Option(
             cf=("svn", "password"), dest="svn_password", help="SVN password"),
@@ -31,6 +25,18 @@ class Svn(Bcfg2.Server.Plugin.Version):
             cf=("svn", "always_trust"), dest="svn_trust_ssl",
             help="Always trust SSL certs from SVN server")]
 
+    if HAS_SVN:
+        options.append(
+            Bcfg2.Options.Option(
+                cf=("svn", "conflict_resolution"),
+                dest="svn_conflict_resolution",
+                type=lambda v: v.replace("-", "_"),
+                # pylint: disable=E1101
+                choices=dir(pysvn.wc_conflict_choice),
+                default=pysvn.wc_conflict_choice.postpone,
+                # pylint: enable=E1101
+                help="SVN conflict resolution method"))
+
     __author__ = 'bcfg-dev@mcs.anl.gov'
     __vcs_metadata_path__ = ".svn"
     if HAS_SVN: