Merge lp:~bigdata-dev/charms/trusty/apache-flume-syslog/trunk into lp:charms/trusty/apache-flume-syslog

[Cory Johns]

Remove trivial test in favor of bundle tests.

[lp:~bigdata-dev/charms/trusty/apache-flume-syslog/trunk]

18. By Cory Johns on 2015-10-06

Re-added trivial test

19. By Cory Johns on 2015-10-06

Switch to S3 for flume binaries

20. By Cory Johns on 2015-10-06

Update mailing list

[Kevin W Monroe (kwmonroe)]

LGTM

review: Approve

=== modified file 'README.md'
--- README.md	2015-08-25 06:00:05 +0000
+++ README.md	2015-10-06 18:18:59 +0000
@@ -88,7 +88,7 @@
 
 ## Contact Information
 
-- <[e-mail]>
+- <[e-mail]>
 
 
 ## Help
 
=== modified file 'hooks/callbacks.py'
--- hooks/callbacks.py	2015-09-10 04:24:51 +0000
+++ hooks/callbacks.py	2015-10-06 18:18:59 +0000
@@ -53,7 +53,7 @@
         self.verify_resources = utils.verify_resources(*self.resources.values())
 
     def is_installed(self):
-        return unitdata.kv().get('flume.installed')
+        return unitdata.kv().get('flume_syslog.installed')
 
     def install(self, force=False):
         if not force and self.is_installed():
@@ -66,7 +66,7 @@
         self.dist_config.add_packages()
         self.setup_flume_config()
         self.configure_flume()
-        unitdata.kv().set('flume.installed', True)
+        unitdata.kv().set('flume_syslog.installed', True)
 
     def setup_flume_config(self):
         '''
 
=== modified file 'resources.yaml'
--- resources.yaml	2015-08-25 06:00:05 +0000
+++ resources.yaml	2015-10-06 18:18:59 +0000
@@ -7,6 +7,6 @@
     pypi: jujubigdata>=4.0.0,<5.0.0
 optional_resources:
   flume-x86_64:
-    url: https://git.launchpad.net/bigdata-data/plain/apache/x86_64/apache-flume-1.6.0-bin.tar.gz?id=c34a21c939f5fce9ab89b95d65fe2df50e7bbab0
+    url: https://s3.amazonaws.com/jujubigdata/apache/x86_64/apache-flume-1.6.0-bin-defd21a.tar.gz
     hash: defd21ad8d2b6f28cc0a16b96f652099
     hash_type: md5
 
=== added directory 'tests'
=== removed directory 'tests'
=== removed file 'tests/00-setup'
--- tests/00-setup	2015-06-18 22:40:46 +0000
+++ tests/00-setup	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-sudo add-apt-repository ppa:juju/stable -y
-sudo apt-get update
-sudo apt-get install python3 amulet -y
 
=== added file 'tests/01-basic-deployment.py'
--- tests/01-basic-deployment.py	1970-01-01 00:00:00 +0000
+++ tests/01-basic-deployment.py	2015-10-06 18:18:59 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+import unittest
+import amulet
+
+
+class TestDeploy(unittest.TestCase):
+    """
+    Trivial deployment test for Apache Flume / Syslog.
+
+    This charm cannot do anything useful by itself, so integration testing
+    is done in the bundle.
+    """
+
+    def test_deploy(self):
+        self.d = amulet.Deployment(series='trusty')
+        self.d.add('flume-syslog', 'apache-flume-syslog')
+        self.d.setup(timeout=900)
+        self.d.sentry.wait(timeout=1800)
+        self.unit = self.d.sentry['flume-syslog'][0]
+
+
+if __name__ == '__main__':
+    unittest.main()
 
=== removed directory 'tests/remote'
=== removed file 'tests/remote/test_dist_config.py'
--- tests/remote/test_dist_config.py	2015-08-25 06:00:05 +0000
+++ tests/remote/test_dist_config.py	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-
-import grp
-import os
-import pwd
-import unittest
-
-from charmhelpers.contrib import bigdata
-
-
-class TestDistConfig(unittest.TestCase):
-    """
-    Test that the ``dist.yaml`` settings were applied properly, such as users, groups, and dirs.
-
-    This is done as a remote test on the deployed unit rather than a regular
-    test under ``tests/`` because filling in the ``dist.yaml`` requires Juju
-    context (e.g., config).
-    """
-    @classmethod
-    def setUpClass(cls):
-        config = None
-        config_dir = os.environ['JUJU_CHARM_DIR']
-        config_file = 'dist.yaml'
-        if os.path.isfile(os.path.join(config_dir, config_file)):
-            config = os.path.join(config_dir, config_file)
-        if not config:
-            raise IOError('Could not find {} in {}'.format(config_file, config_dir))
-        reqs = ['vendor', 'hadoop_version', 'packages', 'groups', 'users',
-                'dirs']
-        cls.dist_config = bigdata.utils.DistConfig(config, reqs)
-
-    def test_groups(self):
-        for name in self.dist_config.groups:
-            try:
-                grp.getgrnam(name)
-            except KeyError:
-                self.fail('Group {} is missing'.format(name))
-
-    def test_users(self):
-        for username, details in self.dist_config.users.items():
-            try:
-                user = pwd.getpwnam(username)
-            except KeyError:
-                self.fail('User {} is missing'.format(username))
-            for groupname in details['groups']:
-                try:
-                    group = grp.getgrnam(groupname)
-                except KeyError:
-                    self.fail('Group {} referenced by user {} does not exist'.format(
-                        groupname, username))
-                if group.gr_gid != user.pw_gid:
-                    self.assertIn(username, group.gr_mem, 'User {} not in group {}'.format(
-                        username, groupname))
-
-    def test_dirs(self):
-        for name, details in self.dist_config.dirs.items():
-            dirpath = self.dist_config.path(name)
-            self.assertTrue(dirpath.isdir(), 'Dir {} is missing'.format(name))
-            stat = dirpath.stat()
-            owner = pwd.getpwuid(stat.st_uid).pw_name
-            group = grp.getgrgid(stat.st_gid).gr_name
-            perms = stat.st_mode & ~0o40000
-            self.assertEqual(owner, details.get('owner', 'root'),
-                             'Dir {} ({}) has wrong owner: {}'.format(name, dirpath, owner))
-            self.assertEqual(group, details.get('group', 'root'),
-                             'Dir {} ({}) has wrong group: {}'.format(name, dirpath, group))
-            self.assertEqual(perms, details.get('perms', 0o755),
-                             'Dir {} ({}) has wrong perms: 0o{:o}'.format(name, dirpath, perms))
-
-
-if __name__ == '__main__':
-    unittest.main()
 
=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2015-10-06 18:18:59 +0000
@@ -0,0 +1,3 @@
+reset: false
+packages:
+  - amulet