Merge lp:~bcsaller/charm-tools/fix-deps-again into lp:charm-tools/1.6

[Marco Ceppi]

[lp:~bcsaller/charm-tools/fix-deps-again]

364. By Benjamin Saller on 2015-09-03

fix tests, pip arguments changed

365. By Benjamin Saller on 2015-09-03

func test fallout, unrelated chagnes in CH

[Benjamin Saller (bcsaller)]

I'd thought this was merged, people are still seeing issues related to this.

[Tim Van Steenburgh (tvansteenburgh)]

review: Approve

=== modified file 'charmtools/compose/__init__.py'
--- charmtools/compose/__init__.py	2015-08-27 19:13:01 +0000
+++ charmtools/compose/__init__.py	2015-09-03 17:47:51 +0000
@@ -379,7 +379,7 @@
                     "Changes will be overwritten")
             else:
                 raise ValueError(
-                    "Unable to continue due to unexpected modifications")
+                    "Unable to continue due to unexpected modifications (try --force)")
         return a, c, d
 
     def __call__(self):

=== modified file 'charmtools/compose/tactics.py'
--- charmtools/compose/tactics.py	2015-08-27 19:13:01 +0000
+++ charmtools/compose/tactics.py	2015-09-03 17:47:51 +0000
@@ -406,26 +406,36 @@
             utils.Process(("pip",
                         "install",
                         "-U",
-                        "--exists-action",
-                        "i",
                         "-t",
                         temp_dir,
                         spec)).throw_on_error()()
             dirs = temp_dir.listdir()
             self._tracked = []
             for d in dirs:
-                d.move(target)
-                self._tracked.append(target / d)
+                d = d.relpath(temp_dir)
+                dst = target / d
+                if dst.exists():
+                    if dst.isdir():
+                        dst.rmtree_p()
+                    elif dst.isfile():
+                        dst.remove()
+                d.move(dst)
+                self._tracked.append(dst)
 
     def sign(self):
         """return sign in the form {relpath: (origin layer, SHA256)}
         """
         sigs = {}
         for d in self._tracked:
-            for entry, sig in utils.walk(d,
-                                         utils.sign, kind="files"):
-                relpath = entry.relpath(self._target.directory)
-                sigs[relpath] = (self.current.url, "dynamic", sig)
+            if d.isdir():
+                for entry, sig in utils.walk(d,
+                                            utils.sign, kind="files"):
+                    relpath = entry.relpath(self.target.directory)
+                    sigs[relpath] = (self.current.url, "dynamic", sig)
+            elif d.isfile():
+                relpath = d.relpath(self.target.directory)
+                sigs[relpath] = (
+                    self.current.url, "dynamic", utils.sign(d))
         return sigs
 
 

=== modified file 'charmtools/fetchers.py'
--- charmtools/fetchers.py	2015-09-01 21:19:06 +0000
+++ charmtools/fetchers.py	2015-09-03 17:47:51 +0000
@@ -40,7 +40,12 @@
     if not name:
         return dir_
     new_dir = os.path.join(os.path.dirname(dir_), name)
-    os.rename(dir_, new_dir)
+    if not os.path.exists(new_dir):
+        # This ignores existing repos
+        # In truth we want control over management of existing
+        # repos with per VCS branch selections
+        # ex: switching the git branch marked in revision
+        os.rename(dir_, new_dir)
     return new_dir
 
 

=== modified file 'tests/test_compose.py'
--- tests/test_compose.py	2015-08-27 19:13:01 +0000
+++ tests/test_compose.py	2015-09-03 17:47:51 +0000
@@ -211,7 +211,6 @@
 
         # show that we pulled charmhelpers from the basic layer as well
         mcall.assert_called_with(("pip", "install", "-U",
-                                  '--exists-action', 'i',
                                   "-t", mock.ANY,
                                   mock.ANY))
 
@@ -229,7 +228,6 @@
         composer.PHASES = composer.PHASES[:-2]
         composer()
         mcall.assert_called_with(("pip", "install", "-U",
-                                  '--exists-action', 'i',
                                   "-t", mock.ANY,
                                   "charmhelpers"))
 

=== modified file 'tests_functional/create/test_ansible_create.py'
--- tests_functional/create/test_ansible_create.py	2015-08-20 13:31:58 +0000
+++ tests_functional/create/test_ansible_create.py	2015-09-03 17:47:51 +0000
@@ -68,6 +68,7 @@
             'lib/charmhelpers/core/hookenv.py',
             'lib/charmhelpers/core/host.py',
             'lib/charmhelpers/core/hugepage.py',
+            'lib/charmhelpers/core/kernel.py',
             'lib/charmhelpers/core/services/__init__.py',
             'lib/charmhelpers/core/services/base.py',
             'lib/charmhelpers/core/services/helpers.py',

=== modified file 'tests_functional/create/test_python_create.py'
--- tests_functional/create/test_python_create.py	2015-08-20 13:31:58 +0000
+++ tests_functional/create/test_python_create.py	2015-09-03 17:47:51 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+
 #    Copyright (C) 2014  Canonical Ltd.
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -59,6 +60,7 @@
             'lib/charmhelpers/core/hookenv.py',
             'lib/charmhelpers/core/host.py',
             'lib/charmhelpers/core/hugepage.py',
+            'lib/charmhelpers/core/kernel.py',
             'lib/charmhelpers/core/services/__init__.py',
             'lib/charmhelpers/core/services/base.py',
             'lib/charmhelpers/core/services/helpers.py',