Merge remote-tracking branch 'github/stable/18.11'

.gitreview

@@ -3,4 +3,4 @@ host=review.opendev.org
 port=29418
 project=openstack/charm-ceilometer.git
 
-defaultbranch=stable/19.04
+defaultbranch=stable/18.11

charm-helpers-hooks.yaml

-repo: https://github.com/juju/charm-helpers@stable/19.04
-destination: charmhelpers
+repo: https://github.com/juju/charm-helpers@stable/18.11
+destination: hooks/charmhelpers
 include:
     - core
     - osplatform

unit_tests/test_ceilometer_utils.py

@@ -367,7 +367,8 @@ class CeilometerUtilsTest(CharmTestCase):
         self.is_leader.return_value = True
         self.os_release.return_value = 'ocata'
         utils.ceilometer_upgrade()
-        mock_subprocess.check_call.assert_called_with(['ceilometer-upgrade', '--skip-metering-database'])
+        mock_subprocess.check_call.assert_called_with(
+            ['ceilometer-upgrade', '--skip-metering-database'])
 
     @patch.object(utils, 'subprocess')
     def test_ceilometer_upgrade_mitaka(self, mock_subprocess):