Merge lp:~free.ekanayaka/landscape-charm/faster-hashids-test into lp:~landscape/landscape-charm/trunk

[Free Ekanayaka]

Use the sample hash-id-databases configuration in order to make the test_hash_id_databases_cron test run faster.

Use the sample hash-id-databases configuration in order to make the test_hash_id_databases_cron test run faster.

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 291
Branch: lp:~free.ekanayaka/landscape-charm/faster-hashids-test
Jenkins: https://ci.lscape.net/job/latch-test/1072/

review: Approve (test results)

[Chad Smith (chad.smith)]

Marking Needs Fixing to see how you intend to resolve the current error.

review: Needs Fixing

[lp:~free.ekanayaka/landscape-charm/faster-hashids-test]

292. By Free Ekanayaka on 2015-05-29

Address review comments

293. By Free Ekanayaka on 2015-05-29

Merge from trunk, fix conflicts

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 293
Branch: lp:~free.ekanayaka/landscape-charm/faster-hashids-test
Jenkins: https://ci.lscape.net/job/latch-test/1114/

review: Approve (test results)

[Adam Collard (adam-collard)]

+1.

Sorry this took so long, I fell in the usual traps for integration tests on charms.

1) don't run make integration-test; run make integration-test-trunk
2) don't use a MAAS provider that you're not pointing DNS at

review: Approve

[Free Ekanayaka (free.ekanayaka)]

> +1.
>
> Sorry this took so long, I fell in the usual traps for integration tests on
> charms.
>
> 1) don't run make integration-test; run make integration-test-trunk
> 2) don't use a MAAS provider that you're not pointing DNS at

Errata corrige:

2) don't use a MAAS provider, use a local provider

[Chad Smith (chad.smith)]

Yes my failing was regarding running make integration-test (which fails with 100% of the time with this branch) and not make integration-test-trunk.

I'm not sure we need backwards compatibility for make integration-test in landscape-charm/trunk with landscape-charm/stable as this charm branch will eventually be stable when we are trying to run make integration-test in jenkins.

review: Approve

=== modified file 'Makefile'
--- Makefile	2015-05-26 12:57:37 +0000
+++ Makefile	2015-05-29 09:32:29 +0000
@@ -41,7 +41,7 @@
 	fi
 
 integration-test: test-depends
-	juju test --set-e -p SKIP_SLOW_TESTS,LS_CHARM_SOURCE,JUJU_HOME,JUJU_ENV,PG_MANUAL_TUNING -v --timeout 3000s
+	juju test --set-e -p LS_CHARM_SOURCE,JUJU_HOME,JUJU_ENV,PG_MANUAL_TUNING -v --timeout 3000s
 
 integration-test-dense-maas:
 	DEPLOYER_TARGET=landscape-dense-maas $(MAKE) integration-test

=== modified file 'lib/apt.py'
--- lib/apt.py	2015-05-26 07:23:02 +0000
+++ lib/apt.py	2015-05-29 09:32:29 +0000
@@ -8,6 +8,7 @@
 from charmhelpers.core import hookenv
 
 from lib.hook import HookError
+from lib.paths import default_paths
 
 PACKAGES = ("landscape-server",)
 PACKAGES_DEV = ("dpkg-dev", "pbuilder")
@@ -45,10 +46,12 @@
     tarball.
     """
 
-    def __init__(self, hookenv=hookenv, fetch=fetch, subprocess=subprocess):
+    def __init__(self, hookenv=hookenv, fetch=fetch, subprocess=subprocess,
+                 paths=default_paths):
         self._hookenv = hookenv
         self._fetch = fetch
         self._subprocess = subprocess
+        self._paths = paths
 
     def set_sources(self):
         """Configure the extra APT sources to use."""
@@ -70,6 +73,14 @@
         packages = self._fetch.filter_installed_packages(PACKAGES)
         self._fetch.apt_install(packages, options=options, fatal=True)
 
+        if self._use_sample_hashids():
+            config_dir = self._paths.config_dir()
+            real = os.path.join(config_dir, "hash-id-databases.conf")
+            sample = os.path.join(config_dir, "hash-id-databases-sample.conf")
+            if not os.path.exists(real + ".orig"):
+                os.rename(real, real + ".orig")
+                shutil.copy(sample, real)
+
     def _set_remote_source(self):
         """Set the remote APT repository to use, if new or changed."""
         config = self._hookenv.config()

=== modified file 'lib/paths.py'
--- lib/paths.py	2015-05-21 07:31:32 +0000
+++ lib/paths.py	2015-05-29 09:32:29 +0000
@@ -8,6 +8,7 @@
 INSTALL_DIR = "/opt/canonical/landscape"
 CONFIG_DIR = INSTALL_DIR + "/configs/standalone"
 OFFLINE_DIR = INSTALL_DIR + "/canonical/landscape/offline"
+
 SCHEMA_SCRIPT = "/usr/bin/landscape-schema"
 
 LICENSE_FILE = "/etc/landscape/license.txt"

=== modified file 'lib/tests/rootdir.py'
--- lib/tests/rootdir.py	2015-04-29 15:53:55 +0000
+++ lib/tests/rootdir.py	2015-05-29 09:32:29 +0000
@@ -16,7 +16,7 @@
     def setUp(self):
         super(RootDir, self).setUp()
         self.paths = Paths(self.path)
-        os.makedirs(os.path.dirname(self.paths.config_dir()))
+        os.makedirs(self.paths.config_dir())
         os.makedirs(os.path.dirname(self.paths.ssl_certificate()))
         os.makedirs(self.paths.offline_dir())
         for path in ERRORFILES_MAP.itervalues():

=== modified file 'lib/tests/test_apt.py'
--- lib/tests/test_apt.py	2015-05-29 07:05:34 +0000
+++ lib/tests/test_apt.py	2015-05-29 09:32:29 +0000
@@ -9,6 +9,7 @@
 from lib.hook import HookError
 from lib.tests.stubs import FetchStub, SubprocessStub
 from lib.tests.helpers import HookenvTest
+from lib.tests.rootdir import RootDir
 
 
 class AptTest(HookenvTest):
@@ -17,11 +18,14 @@
         super(AptTest, self).setUp()
         self.fetch = FetchStub()
         self.subprocess = SubprocessStub()
+        self.root_dir = self.useFixture(RootDir())
+        self.paths = self.root_dir.paths
         self.subprocess.add_fake_executable("add-apt-repository")
         self.subprocess.add_fake_executable(
             "/usr/lib/pbuilder/pbuilder-satisfydepends")
         self.apt = Apt(
-            hookenv=self.hookenv, fetch=self.fetch, subprocess=self.subprocess)
+            hookenv=self.hookenv, fetch=self.fetch, subprocess=self.subprocess,
+            paths=self.paths)
 
     def _create_local_tarball(self, name, version):
         """Create a local minimal source package tarball that can be built.
@@ -173,3 +177,54 @@
         self.apt.install_packages()
         options = list(DEFAULT_INSTALL_OPTIONS) + ["--allow-unauthenticated"]
         self.assertEqual([(PACKAGES, options, True)], self.fetch.installed)
+
+    def test_install_sample_hashids(self):
+        """
+        If a file named 'use-sample-hashids' is found the install() method
+        replaces the real hash-id-databases config file with the sample one.
+        """
+        self.hookenv.config()["source"] = "ppa:landscape/14.10"
+        charm_dir = self.hookenv.charm_dir()
+        config_dir = self.paths.config_dir()
+        flag_file = os.path.join(charm_dir, "use-sample-hashids")
+        real = os.path.join(config_dir, "hash-id-databases.conf")
+        sample = os.path.join(config_dir, "hash-id-databases-sample.conf")
+        with open(flag_file, "w") as fd:
+            fd.write("")
+        with open(real, "w") as fd:
+            fd.write("real")
+        with open(sample, "w") as fd:
+            fd.write("sample")
+        self.apt.install_packages()
+
+        with open(real + ".orig") as fd:
+            self.assertEqual("real", fd.read())
+
+        with open(real) as fd:
+            self.assertEqual("sample", fd.read())
+
+    def test_install_sample_hashids_idempotent(self):
+        """
+        The real hash-id-databases configuration file is not renamed again
+        if was already.
+        """
+        self.hookenv.config()["source"] = "ppa:landscape/14.10"
+        charm_dir = self.hookenv.charm_dir()
+        config_dir = self.paths.config_dir()
+        flag_file = os.path.join(charm_dir, "use-sample-hashids")
+        real = os.path.join(config_dir, "hash-id-databases.conf")
+        sample = os.path.join(config_dir, "hash-id-databases-sample.conf")
+        with open(flag_file, "w") as fd:
+            fd.write("")
+        with open(real, "w") as fd:
+            fd.write("real")
+        with open(sample, "w") as fd:
+            fd.write("sample")
+        self.apt.install_packages()
+        self.apt.install_packages()
+
+        with open(real + ".orig") as fd:
+            self.assertEqual("real", fd.read())
+
+        with open(real) as fd:
+            self.assertEqual("sample", fd.read())

=== modified file 'tests/basic/test_service.py'
--- tests/basic/test_service.py	2015-05-22 09:15:39 +0000
+++ tests/basic/test_service.py	2015-05-29 09:32:29 +0000
@@ -4,10 +4,6 @@
 FIXME: revert to using ssh -q, stderr=STDOUT instead of 2>&1, stderr=PIPE once
        lp:1281577 is addressed.
 """
-
-import unittest
-
-from os import getenv
 from subprocess import check_output, CalledProcessError, PIPE
 
 from helpers import IntegrationTest
@@ -234,8 +230,6 @@
         self.assertEqual(output, "")
         self.assertEqual(status, 0)
 
-    @unittest.skipIf(getenv("SKIP_SLOW_TESTS", None),
-                     "Requested to skip slow tests.")
     def test_hash_id_databases_cron(self):
         """Verify that the hash_id_databases cron job runs without errors."""
         script = "/opt/canonical/landscape/scripts/hash_id_databases.sh"