Merge lp:~tvansteenburgh/juju-deployer/fix-git into lp:juju-deployer

[Tim Van Steenburgh]

Fix bugs in Git impl; add tests.

[Kapil Thangavelu (hazmat)]

merged with some minor changes, thanks.

review: Approve

=== modified file 'deployer/tests/test_charm.py'
--- deployer/tests/test_charm.py	2014-09-03 13:17:33 +0000
+++ deployer/tests/test_charm.py	2014-09-29 13:34:03 +0000
@@ -5,6 +5,7 @@
 from deployer.charm import Charm
 from deployer.utils import ErrorExit, yaml_dump
 from deployer.vcs import Bzr as BaseBzr
+from deployer.vcs import Git as BaseGit
 from .base import Base
 
 
@@ -51,7 +52,7 @@
     branch = update = pull = None
 
 
-class CharmTest(Base):
+class BzrCharmTest(Base):
 
     def setUp(self):
         self.repo_path = d = self.mkdir()
@@ -151,3 +152,143 @@
             "scratch", self.repo_path, "precise", params)
         self.assertRaises(ErrorExit, charm.fetch)
         self.assertIn('bzr: ERROR: Not a branch: ', self.output.getvalue())
+
+
+class Git(BaseGit):
+
+    def __init__(self, path):
+        super(Git, self).__init__(
+            path, "", logging.getLogger("deployer.repo"))
+
+    def init(self):
+        self._call(
+            ["git", "init", self.path],
+            "Could not initialize repo at  %(path)s")
+
+    def write(self, files):
+        for f in files:
+            with open(os.path.join(
+                    self.path, f), 'w') as fh:
+                fh.write(files[f])
+            self._call(
+                ["git", "add", f],
+                "Could not add file %s" % f)
+
+    def commit(self, msg):
+        self._call(
+            ["git", "commit", "-m", msg],
+            "Could not commit at %(path)s")
+
+    def revert(self):
+        self._call(
+            ["git", "reset", "--hard"],
+            "Could not revert at %(path)s")
+
+    def tag(self, name):
+        self._call(
+            ["git", "tag", name],
+            "Could not tag at %(path)s")
+
+    branch = update = pull = None
+
+
+class GitCharmTest(Base):
+
+    def setUp(self):
+        self.repo_path = d = self.mkdir()
+        self.series_path = os.path.join(d, "precise")
+        os.mkdir(self.series_path)
+        self.output = self.capture_logging(
+            "deployer.charm", level=logging.DEBUG)
+
+    def setup_vcs_charm(self):
+        self.branch = Git(self.mkdir())
+        self.branch.init()
+        self.branch.write(
+            {'metadata.yaml': yaml_dump({
+                'name': 'couchdb',
+                'summary': 'RESTful document oriented database',
+                'provides': {
+                    'db': {
+                        'interface': 'couchdb'}}}),
+             'revision': '3'})
+        self.branch.commit('initial')
+        self.branch.write({'revision': '4'})
+        self.branch.commit('next')
+        self.branch.tag('v2')
+        self.branch.write({'revision': '5'})
+        self.branch.commit('next')
+
+        self.charm_data = {
+            "charm": "couchdb",
+            "build": None,
+            "branch": self.branch.path,
+            "rev": None,
+            "charm_url": None,
+        }
+
+    def test_vcs_charm(self):
+        self.setup_vcs_charm()
+        params = dict(self.charm_data)
+        charm = Charm.from_service(
+            "scratch", self.repo_path, "precise", params)
+
+        charm.fetch()
+        self.assertEqual(charm.metadata['name'],  'couchdb')
+        HEAD = charm.vcs.get_cur_rev()
+
+        self.assertFalse(charm.is_modified())
+        with open(os.path.join(charm.path, 'revision'), 'w') as fh:
+            fh.write('0')
+        self.assertTrue(charm.is_modified())
+        Git(charm.path).revert()
+
+        charm.rev = None
+        # Update goes to latest with no revision specified
+        charm.update()
+        self.assertEqual(charm.vcs.get_cur_rev(), HEAD)
+
+    def test_vcs_fetch_with_rev(self):
+        self.setup_vcs_charm()
+        params = dict(self.charm_data)
+        rev2 = self.branch._call(
+            "git rev-parse HEAD~1".split(),
+            self.branch.err_cur_rev,
+        )
+        params['branch'] = '{}@{}'.format(params['branch'], rev2)
+        charm = Charm.from_service(
+            "scratch", self.repo_path, "precise", params)
+        charm.fetch()
+        self.assertEqual(charm.vcs.get_cur_rev(), rev2)
+
+    def test_store_charm(self):
+        pass
+
+    charms_vcs_series = [
+        ({"charm": "local:precise/mongodb",
+          "branch": "lp:charms/precise/couchdb"},
+         'trusty', 'precise/mongodb'),
+        ({"series": "trusty",
+          "charm": "couchdb",
+          "branch": "lp:charms/precise/couchdb"},
+         'precise', 'trusty/couchdb')]
+
+    def test_vcs_charm_with_series(self):
+        for data, dseries, path in self.charms_vcs_series:
+            charm = Charm.from_service(
+                "db", "/tmp", dseries, data)
+            self.assertEqual(
+                charm.path,
+                os.path.join('/tmp', path))
+            self.assertEqual(
+                charm.series_path, os.path.join('/tmp', path.split('/')[0]))
+
+    def test_charm_error(self):
+        branch = self.mkdir()
+        params = {
+            'charm': 'couchdb',
+            'branch': "file://%s" % branch}
+        charm = Charm.from_service(
+            "scratch", self.repo_path, "precise", params)
+        self.assertRaises(ErrorExit, charm.fetch)
+        self.assertIn('bzr: ERROR: Not a branch: ', self.output.getvalue())

=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2014-02-22 23:11:02 +0000
+++ deployer/tests/test_guiserver.py	2014-09-29 13:34:03 +0000
@@ -27,8 +27,8 @@
             'deployment', 'description', 'destroy_services', 'diff',
             'find_service', 'ignore_errors', 'juju_env', 'list_deploys',
             'no_local_mods', 'overrides', 'rel_wait', 'retry_count', 'series',
-            'terminate_machines', 'timeout', 'update_charms', 'verbose',
-            'watch'
+            'skip_unit_wait', 'terminate_machines', 'timeout', 'update_charms',
+            'verbose', 'watch'
         ])
         self.assertEqual(expected_keys, set(self.options.__dict__.keys()))
 

=== modified file 'deployer/tests/test_importer.py'
--- deployer/tests/test_importer.py	2014-02-22 23:33:57 +0000
+++ deployer/tests/test_importer.py	2014-09-29 13:34:03 +0000
@@ -38,6 +38,7 @@
             'rel_wait': 60,
             'retry_count': 0,
             'series': None,
+            'skip_unit_wait': False,
             'terminate_machines': False,
             'timeout': 2700,
             'update_charms': False,

=== modified file 'deployer/vcs.py'
--- deployer/vcs.py	2014-04-21 22:49:05 +0000
+++ deployer/vcs.py	2014-09-29 13:34:03 +0000
@@ -99,11 +99,11 @@
         self._call(params, self.err_update)
 
     def branch(self):
-        params = ["git", "clone", "--depth", "1", self.branch]
+        params = ["git", "clone", "--depth", "1", self.origin, self.path]
         self._call(params, self.err_branch, os.path.dirname(self.path))
 
     def is_modified(self):
-        params = ["git", "stat", "-s"]
+        params = ["git", "status", "-s"]
         return bool(self._call(params, self.err_is_mod).strip())
 
     def get_origin(self):