Merge lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk into lp:charms/trusty/apache-hadoop-client

[Cory Johns]

Remove trivial test in favor of bundle tests.

[lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk]

102. By Cory Johns on 2015-10-06

Re-added trivial test

103. By Cory Johns on 2015-10-06

Update mailing list

[Kevin W Monroe (kwmonroe)]

LGTM, +1

review: Approve

=== modified file 'README.md'
--- README.md	2015-08-24 23:19:00 +0000
+++ README.md	2015-10-06 18:07:13 +0000
@@ -25,7 +25,7 @@
 
 ## Contact Information
 
-- <[e-mail]>
+- <[e-mail]>
 
 
 ## Hadoop
 
=== added directory 'tests'
=== removed directory 'tests'
=== removed file 'tests/00-setup'
--- tests/00-setup	2015-02-16 22:20:57 +0000
+++ tests/00-setup	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if ! dpkg -s amulet &> /dev/null; then
-    echo Installing Amulet...
-    sudo add-apt-repository -y ppa:juju/stable
-    sudo apt-get update
-    sudo apt-get -y install amulet
-fi
 
=== 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:07:13 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+import unittest
+import amulet
+
+
+class TestDeploy(unittest.TestCase):
+    """
+    Trivial deployment test for Apache Hadoop Cliennt.
+
+    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('client', 'apache-hadoop-client')
+        self.d.setup(timeout=900)
+        self.d.sentry.wait(timeout=1800)
+        self.unit = self.d.sentry['client'][0]
+
+
+if __name__ == '__main__':
+    unittest.main()
 
=== removed file 'tests/01-basic-deployment.py'
--- tests/01-basic-deployment.py	2015-09-15 17:13:14 +0000
+++ tests/01-basic-deployment.py	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-
-import unittest
-import amulet
-
-
-class TestDeploy(unittest.TestCase):
-    """
-    Basic deployment test for Apache Hadoop Client.
-
-    This charm cannot do anything useful by itself, so integration testing
-    is done in the bundle.
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        cls.d = amulet.Deployment(series='trusty')
-        cls.d.add('apache-hadoop-client')
-        cls.d.setup(timeout=900)
-        cls.d.sentry.wait(timeout=1800)
-        cls.unit = cls.d.sentry.unit['apache-hadoop-client/0']
-
-    def test_deploy(self):
-        output, retcode = self.unit.run("pgrep -a java")
-        assert 'ResourceManager' not in output, "ResourceManager should not be started"
-        assert 'JobHistoryServer' not in output, "JobHistoryServer should not be started"
-        assert 'NodeManager' not in output, "NodeManager should not be started"
-        assert 'NameNode' not in output, "NameNode should not be started"
-        assert 'SecondaryNameNode' not in output, "SecondaryNameNode should not be started"
-        assert 'DataNode' not in output, "DataServer should not be started"
-
-
-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:07:13 +0000
@@ -0,0 +1,3 @@
+reset: false
+packages:
+  - amulet