Merge lp:~lazypower/charms/trusty/db2/test-fixup into lp:~suchvenu/charms/trusty/db2/ibmdb2

[Charles Butler]

Demonstrating a working deployment, with isolated configuration injection logic

[Suchitra Venugopal (suchvenu)]

review: Disapprove

Unmerged revisions

2. By Charles Butler on 2015-07-14

Adjust the test routine demonstrating a working test deployment

=== modified file 'tests/10-bundles-test.py' (properties changed: -x to +x)
--- tests/10-bundles-test.py	2015-07-14 11:32:09 +0000
+++ tests/10-bundles-test.py	2015-07-14 13:08:22 +0000
@@ -20,24 +20,13 @@
         """ Set up an amulet deployment using the bundle. """
         d = amulet.Deployment()
 
-        local_path = os.path.join(os.path.dirname(__file__), 'local.yaml')
-        with open(local_path, "r") as fd:
-           config = yaml.safe_load(fd)
-
-        url = config.get('db2').get('db2_url')
-	print('Using URL  %s' % url)
-        # Test if a DB2 url for the repository is defined
-        if not url:
-            print("You need to define a url for the DB2 packages repository.\n"
-              "Edit local.yaml or tests/00-setup and run it again.")
-            sys.exit(1)
-
-        pkg = config.get('db2').get('db2_package')
-	print('Using DB2 package %s' % pkg)
-        if not pkg:
-            print("You need to define a package name for IBM DB2.\n"
-              "Edit local.yaml or tests/00-setup and run it again.")
-            sys.exit(1)
+        # We have a contextual test, if no config is present, initialze the
+        # test with an empty configuration set
+        config = {}
+
+        cfgpath = os.path.join(os.path.dirname(__file__), 'local.yaml')
+        if os.path.exists(cfgpath):
+            config = load_config(cfgpath)
 
         bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
         with open(bundle_path, 'r') as bundle_file:
@@ -45,7 +34,8 @@
             d.load(contents)
 
         # Software doesn't actually install until you accept the license
-        d.configure('db2', { 'accept-ibm-db2-license': True, 'db2_url': url, 'db2_package_name' : pkg })
+        import pdb; pdb.set_trace()
+        d.configure('db2', config)
 
         d.setup(seconds_to_wait)
         d.sentry.wait(seconds_to_wait)
@@ -55,5 +45,22 @@
         """ Test to see if the bundle deployed successfully. """
         self.assertTrue(self.d.deployed)
 
+
+
+# Python unit testing frameworks only invokes methods prefixed with test_
+# this will only be called when implicitly invoked
+def load_config(config_path):
+    with open(config_path, 'r') as f:
+        bundle_options = yaml.safe_load(f)
+
+    if 'db2_url' not in bundle_options.keys():
+        raise ValueError("db2_url is a required configuration value")
+    if 'db2_package_name' not in bundle_options.keys():
+        raise ValueError("db2_package is a required configuration value")
+
+    return bundle_options
+
+
+
 if __name__ == '__main__':
     unittest.main()

=== modified file 'tests/bundles.yaml'
--- tests/bundles.yaml	2015-07-14 11:32:09 +0000
+++ tests/bundles.yaml	2015-07-14 13:08:22 +0000
@@ -1,7 +1,7 @@
 ibm-db2-bundle: 
   services: 
     "db2": 
-      charm: "db2"
+      charm: "local:trusty/db2"
       num_units: 1
       annotations: 
         "gui-x": "300"

=== modified file 'tests/local.yaml'
--- tests/local.yaml	2015-07-14 11:32:09 +0000
+++ tests/local.yaml	2015-07-14 13:08:22 +0000
@@ -1,3 +1,3 @@
-db2:
 db2_url: "http://9.124.100.99/debs/DB2"
-db2_package: "DB2_Svr_10.5.0.3_Linux_x86-64.tar.gz"
+db2_package_name: "DB2_Svr_10.5.0.3_Linux_x86-64.tar.gz"
+accept-ibm-db2-license: True