adjust cc_snappy for snappy install package with config.

It was believed that to install a package with config the command was:
  snappy install --config=config-file <package> 
Instead, what was implemented in snappy was:
  snappy install <package> [<config-file>]

This modifies cloud-init to invoke the latter and changes the tests
appropriately.

LP: #1438836

1 files changed, 6 insertions, 4 deletions

diff --git a/tests/unittests/test_handler/test_handler_snappy.py b/tests/unittests/test_handler/test_handler_snappy.py
index 8effd99d..f3109bac 100644
--- a/tests/unittests/test_handler/test_handler_snappy.py
+++ b/tests/unittests/test_handler/test_handler_snappy.py
@@ -53,15 +53,17 @@ class TestInstallPackages(t_help.TestCase):
             config = None
             pkg = None
             for arg in args[2:]:
-                if arg.startswith("--config="):
-                    cfgfile = arg.partition("=")[2]
+                if arg.startswith("-"):
+                    continue
+                if not pkg:
+                    pkg = arg
+                elif not config:
+                    cfgfile = arg
                     if cfgfile == "-":
                         config = kwargs.get('data', '')
                     elif cfgfile:
                         with open(cfgfile, "rb") as fp:
                             config = yaml.safe_load(fp.read())
-                elif not pkg and not arg.startswith("-"):
-                    pkg = arg
             self.snapcmds.append(['install', pkg, config])
 
     def test_package_ops_1(self):