Merge lp:~tvansteenburgh/charmtester/bundletester into lp:~bcsaller/charmtester/bundletester

[Tim Van Steenburgh]

Bugfix for charm and bundle tests not being executed if no .bzr directory present.

[lp:~tvansteenburgh/charmtester/bundletester]

47. By Tim Van Steenburgh on 2014-08-11

More accurate bundle detection

Make sure 'services' key is not actually a Charm config option

48. By Tim Van Steenburgh on 2014-08-14

Unique exit code to signify 'No tests found'

Also make exit msg more accurate - 'No tests found' does not necessarily
imply that test target was not a bundle or charm.

49. By Tim Van Steenburgh on 2014-08-18

Use --force when destroying env

50. By Tim Van Steenburgh on 2014-09-07

Change default test search pattern

- Find all executable tests in the tests/ dir by default,
  instead of just those that begin with a number
- cd to the testdir when running tests in order to play
  nicely with amulet's charm lookup machinery
- Fix failing tests caused by new defaults

Unmerged revisions

50. By Tim Van Steenburgh on 2014-09-07

Change default test search pattern

- Find all executable tests in the tests/ dir by default,
  instead of just those that begin with a number
- cd to the testdir when running tests in order to play
  nicely with amulet's charm lookup machinery
- Fix failing tests caused by new defaults

49. By Tim Van Steenburgh on 2014-08-18

Use --force when destroying env

48. By Tim Van Steenburgh on 2014-08-14

Unique exit code to signify 'No tests found'

Also make exit msg more accurate - 'No tests found' does not necessarily
imply that test target was not a bundle or charm.

47. By Tim Van Steenburgh on 2014-08-11

More accurate bundle detection

Make sure 'services' key is not actually a Charm config option

46. By Tim Van Steenburgh on 2014-07-17

Run successfully even if no .bzr dir

45. By Tim Van Steenburgh on 2014-07-16

Change config default values

=== modified file 'bundletester/builder.py'
--- bundletester/builder.py	2014-06-04 16:33:24 +0000
+++ bundletester/builder.py	2014-09-07 22:41:37 +0000
@@ -68,7 +68,7 @@
     def destroy(self):
         if self.options.no_destroy is not True:
             subprocess.check_call(['juju', 'destroy-environment',
-                                   '-y', self.env_name])
+                                   '-y', self.env_name, '--force'])
 
     def reset(self):
         if self.environment:

=== modified file 'bundletester/config.py'
--- bundletester/config.py	2014-06-03 06:54:39 +0000
+++ bundletester/config.py	2014-09-07 22:41:37 +0000
@@ -4,11 +4,11 @@
 class Parser(dict):
     def __defaults__(self):
         return {
-            'bootstrap': False,
-            'reset': False,
+            'bootstrap': True,
+            'reset': True,
             'bundle': None,
             'virtualenv': True,
-            'tests': "[0-9]*",
+            'tests': "*",
             'excludes': [],
             'sources': [],
             'packages': [],

=== modified file 'bundletester/runner.py'
--- bundletester/runner.py	2014-06-05 03:09:55 +0000
+++ bundletester/runner.py	2014-09-07 22:41:37 +0000
@@ -49,9 +49,12 @@
         if self.options.dryrun:
             return 0, ""
 
-        p = subprocess.Popen(executable,
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.STDOUT)
+        p = subprocess.Popen(
+            executable,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            cwd=self.options.testdir,
+        )
         retcode = p.wait()
         output = p.stdout.read()
         log.debug("\n%s" % output)

=== modified file 'bundletester/spec.py'
--- bundletester/spec.py	2014-06-05 03:09:55 +0000
+++ bundletester/spec.py	2014-09-07 22:41:37 +0000
@@ -173,6 +173,10 @@
             continue
         for possible in data.values():
             if isinstance(possible, dict) and 'services' in possible:
+                keys = sorted(possible['services'].keys())
+                if keys == ['default', 'description', 'type']:
+                    # looks like a charm, not a bundle
+                    continue
                 result.append(yamlfn)
                 break
     return result
@@ -196,13 +200,12 @@
     result = {'bundle': bundle,
               'testdir': utils.find_testdir(directory)}
     lp = vcs.Launchpad()
-    data = lp.infer_bundle(directory)
-    if data:
-        result.update(data)
-        if 'name' not in data:
-            metadata = yaml.safe_load(bundle)
-            # XXX: ambiguous
-            result['name'] = metadata.keys(0)
+    data = lp.infer_bundle(directory) or {}
+    result.update(data)
+    if 'name' not in data:
+        metadata = yaml.safe_load(open(bundle))
+        # XXX: ambiguous
+        result['name'] = metadata.keys()[0]
     return models.Bundle(**result)
 
 
@@ -213,12 +216,11 @@
     lp = vcs.Launchpad()
     data = lp.infer_charm(directory) or {}
     testdir = utils.find_testdir(directory)
-    metadata = yaml.safe_load(metadata)
-    if data:
-        data['metadata'] = metadata
-        data['testdir'] = testdir
-        if 'name' not in data:
-            data['name'] = metadata['name']
+    metadata = yaml.safe_load(open(metadata))
+    data['metadata'] = metadata
+    data['testdir'] = testdir
+    if 'name' not in data:
+        data['name'] = metadata['name']
     return models.Charm(**data)
 
 

=== modified file 'bundletester/tester.py'
--- bundletester/tester.py	2014-06-04 16:33:24 +0000
+++ bundletester/tester.py	2014-09-07 22:41:37 +0000
@@ -61,7 +61,8 @@
 
     suite = spec.SuiteFactory(options, options.testdir)
     if not suite:
-        raise SystemExit("No Tests Found: Not a bundle or charm.")
+        sys.stderr.write("No Tests Found\n")
+        sys.exit(3)
 
     report = reporter.get_reporter(options.reporter, options.output, options)
     report.set_suite(suite)

=== modified file 'tests/test_config.py'
--- tests/test_config.py	2014-05-07 19:11:10 +0000
+++ tests/test_config.py	2014-09-07 22:41:37 +0000
@@ -15,8 +15,8 @@
 
     def test_parser_defaults(self):
         parser = config.Parser()
-        self.assertFalse(parser.bootstrap)
-        self.assertFalse(parser.reset)
+        self.assertTrue(parser.bootstrap)
+        self.assertTrue(parser.reset)
         self.assertTrue(parser.virtualenv)
         self.assertEqual(parser.sources, [])
         self.assertEqual(parser.packages, [])
@@ -25,8 +25,8 @@
 
     def test_config_parse(self):
         parser = config.Parser(locate('sample.yaml'))
-        self.assertFalse(parser.bootstrap)
-        self.assertFalse(parser.reset)
+        self.assertTrue(parser.bootstrap)
+        self.assertTrue(parser.reset)
         self.assertTrue(parser.virtualenv)
         self.assertEqual(parser.sources, [])
         self.assertEqual(parser.packages, [])

=== modified file 'tests/test_spec.py'
--- tests/test_spec.py	2014-05-23 09:46:18 +0000
+++ tests/test_spec.py	2014-09-07 22:41:37 +0000
@@ -44,7 +44,7 @@
         self.assertEqual(test.executable, [os.path.abspath(locate('test02'))])
         self.assertEqual(test.setup,  ['setup02'])
         self.assertEqual(test.bootstrap,  False)
-        self.assertEqual(test.reset,  False)
+        self.assertEqual(test.reset, True)
 
     def test_spec_init(self):
         parent = config.Parser()