Merge into trunk : pre-install-hooks : Code : Landscape Charm

Reviewer	Review Type	Date Requested	Status
Chad Smith		2015-05-28	Approve on 2015-05-28
🤖 Landscape Builder	test results		Needs Fixing on 2015-05-28
Adam Collard (community)		2015-05-28	Approve on 2015-05-28
Review via email: mp+260426@code.qastaging.launchpad.net

Revision history for this message

🤖 Landscape Builder (landscape-builder) wrote on 2015-05-28:

#

Command: make ci-test
Result: Success
Revno: 291
Branch: lp:~free.ekanayaka/landscape-charm/pre-install-hooks
Jenkins: https://ci.lscape.net/job/latch-test/1068/

review: Approve (test results)

Revision history for this message

Adam Collard (adam-collard) wrote on 2015-05-28:

#

Minor suggestion inline.

review: Approve

lp://qastaging/~free.ekanayaka/landscape-charm/pre-install-hooks updated on 2015-05-28

292. By Free Ekanayaka on 2015-05-28: Address review comments

Revision history for this message

🤖 Landscape Builder (landscape-builder) wrote on 2015-05-28:

#

Download full text (15.7 KiB)

Command: make ci-test
Result: Fail
Revno: 292
Branch: lp:~free.ekanayaka/landscape-charm/pre-install-hooks
Jenkins: https://ci.lscape.net/job/latch-test/1073/
-------------------------------------------
./dev/ubuntu-deps
Reading package lists...
Building dependency tree...
Reading state information...
software-properties-common is already the newest version.
The following package was automatically installed and is no longer required:
os-prober
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 9 not upgraded.
gpg: keyring `/tmp/tmpxhke205z/secring.gpg' created
gpg: keyring `/tmp/tmpxhke205z/pubring.gpg' created
gpg: requesting key C8068B11 from hkp server keyserver.ubuntu.com
gpg: /tmp/tmpxhke205z/trustdb.gpg: trustdb created
gpg: key C8068B11: public key "Launchpad Ensemble PPA" imported
gpg: Total number processed: 1
gpg: imported: 1 (RSA: 1)
OK
Ign http://security.ubuntu.com trusty-security InRelease
Ign http://ppa.launchpad.net trusty InRelease
Ign http://archive.ubuntu.com trusty InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://ppa.launchpad.net trusty Release.gpg
Ign http://archive.ubuntu.com trusty-updates InRelease
Hit http://security.ubuntu.com trusty-security Release
Hit http://ppa.launchpad.net trusty Release
Hit http://archive.ubuntu.com trusty Release.gpg
Hit http://archive.ubuntu.com trusty-updates Release.gpg
Hit http://archive.ubuntu.com trusty Release
Hit http://archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://ppa.launchpad.net trusty/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://ppa.launchpad.net trusty/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://archive.ubuntu.com trusty/main Sources
Hit http://archive.ubuntu.com trusty/universe Sources
Hit http://archive.ubuntu.com trusty/main amd64 Packages
Hit http://archive.ubuntu.com trusty/universe amd64 Packages
Hit http://archive.ubuntu.com trusty/main Translation-en
Hit http://archive.ubuntu.com trusty/universe Translation-en
Hit http://archive.ubuntu.com trusty-updates/main Sources
Hit http://archive.ubuntu.com trusty-updates/universe Sources
Hit http://archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://archive.ubuntu.com trusty-updates/main Translation-en
Ign https://private-ppa.launchpad.net trusty InRelease
Ign https://private-ppa.launchpad.net trusty InRelease
Hit https://private-ppa.launchpad.net trusty Release.gpg
Hit https://private-ppa.launchpad.net trusty Release.gpg
Hit https://private-ppa.launchpad.net trusty Release
Hit https://private-ppa.launchpad.net trusty Release
Hit http://archive.ubuntu.com trusty-updates/universe Translation-en
Hit https://private-ppa.launchpad.net trusty/main amd64 Packages
Hit https://private-ppa.launchpad.net ...

Command: make ci-test
Result: Fail
Revno: 292
Branch: lp:~free.ekanayaka/landscape-charm/pre-install-hooks
Jenkins: https://ci.lscape.net/job/latch-test/1073/
-------------------------------------------
./dev/ubuntu-deps
Reading package lists...
Building dependency tree...
Reading state information...
software-properties-common is already the newest version.
The following package was automatically installed and is no longer required:
  os-prober
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 9 not upgraded.
gpg: keyring `/tmp/tmpxhke205z/secring.gpg' created
gpg: keyring `/tmp/tmpxhke205z/pubring.gpg' created
gpg: requesting key C8068B11 from hkp server keyserver.ubuntu.com
gpg: /tmp/tmpxhke205z/trustdb.gpg: trustdb created
gpg: key C8068B11: public key "Launchpad Ensemble PPA" imported
gpg: Total number processed: 1
gpg:               imported: 1  (RSA: 1)
OK
Ign http://security.ubuntu.com trusty-security InRelease
Ign http://ppa.launchpad.net trusty InRelease
Ign http://archive.ubuntu.com trusty InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://ppa.launchpad.net trusty Release.gpg
Ign http://archive.ubuntu.com trusty-updates InRelease
Hit http://security.ubuntu.com trusty-security Release
Hit http://ppa.launchpad.net trusty Release
Hit http://archive.ubuntu.com trusty Release.gpg
Hit http://archive.ubuntu.com trusty-updates Release.gpg
Hit http://archive.ubuntu.com trusty Release
Hit http://archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://ppa.launchpad.net trusty/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://ppa.launchpad.net trusty/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://archive.ubuntu.com trusty/main Sources
Hit http://archive.ubuntu.com trusty/universe Sources
Hit http://archive.ubuntu.com trusty/main amd64 Packages
Hit http://archive.ubuntu.com trusty/universe amd64 Packages
Hit http://archive.ubuntu.com trusty/main Translation-en
Hit http://archive.ubuntu.com trusty/universe Translation-en
Hit http://archive.ubuntu.com trusty-updates/main Sources
Hit http://archive.ubuntu.com trusty-updates/universe Sources
Hit http://archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://archive.ubuntu.com trusty-updates/main Translation-en
Ign https://private-ppa.launchpad.net trusty InRelease
Ign https://private-ppa.launchpad.net trusty InRelease
Hit https://private-ppa.launchpad.net trusty Release.gpg
Hit https://private-ppa.launchpad.net trusty Release.gpg
Hit https://private-ppa.launchpad.net trusty Release
Hit https://private-ppa.launchpad.net trusty Release
Hit http://archive.ubuntu.com trusty-updates/universe Translation-en
Hit https://private-ppa.launchpad.net trusty/main amd64 Packages
Hit https://private-ppa.launchpad.net trusty/main Translation-en
Hit https://private-ppa.launchpad.net trusty/main amd64 Packages
Ign http://archive.ubuntu.com trusty/main Translation-en_US
Ign http://archive.ubuntu.com trusty/universe Translation-en_US
Ign https://private-ppa.launchpad.net trusty/main Translation-en_US
Ign https://private-ppa.launchpad.net trusty/main Translation-en
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
python3 is already the newest version.
python3-fixtures is already the newest version.
python3-jinja2 is already the newest version.
python3-zope.testrunner is already the newest version.
curl is already the newest version.
python3-yaml is already the newest version.
charm-tools is already the newest version.
juju-core is already the newest version.
juju-deployer is already the newest version.
python3-amulet is already the newest version.
The following package was automatically installed and is no longer required:
  os-prober
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 9 not upgraded.
Reading package lists...
Building dependency tree...
Reading state information...
python3-flake8 is already the newest version.
The following package was automatically installed and is no longer required:
  os-prober
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 9 not upgraded.
Reading package lists...
Building dependency tree...
Reading state information...
python-fixtures is already the newest version.
python-six is already the newest version.
python-yaml is already the newest version.
The following package was automatically installed and is no longer required:
  os-prober
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 9 not upgraded.
make test
make[1]: Entering directory `/var/jenkins/workspace/latch-test/latchcMzz9M/source_dir'
trial lib
lib.callbacks.tests.test_apt
  SetAPTSourcesTest
    test_run ...                                                           [OK]
lib.callbacks.tests.test_filesystem
  EnsureConfigDirTest
    test_options ...                                                       [OK]
  WriteCustomSSLCertificateTest
    test_config_certificate ...                                            [OK]
    test_haproxy_certificate ...                                           [OK]
  WriteLicenseFileTest
    test_license_file_bad_data ...                                         [OK]
    test_license_file_bad_url ...                                          [OK]
    test_license_file_data ...                                             [OK]
    test_license_file_file_url ...                                         [OK]
    test_license_file_http_url ...                                         [OK]
    test_license_file_unset ...                                            [OK]
lib.callbacks.tests.test_scripts
  LSCtlTest
    test_config_changed_not_only_apt ...                                   [OK]
    test_config_changed_only_apt ...                                       [OK]
    test_start ...                                                         [OK]
    test_stop ...                                                          [OK]
  SchemaBootstrapTest
    test_options ...                                                       [OK]
lib.relations.tests.test_config
  ServicesHookTest
    test_a_valid_root_url_configuration_key_is_set ...                     [OK]
    test_root_url_is_set_and_invalid ...                                   [OK]
    test_root_url_is_set_without_protocol ...                              [OK]
    test_root_url_is_set_without_trailing_slash ...                        [OK]
lib.relations.tests.test_haproxy
  HAProxyProviderTest
    test_cert_and_key_pem_is_used_when_passed_cert_and_key_config ...      [OK]
    test_default_ssl_cert_is_used_without_config_keys ...                  [OK]
    test_files_cannot_be_read ...                                          [OK]
    test_leader_has_package_upload_backend ...                             [OK]
    test_provide_data ...                                                  [OK]
    test_provide_data_error_files ...                                      [OK]
    test_provide_data_raises_hookerror_for_invalid_b64_cert ...            [OK]
    test_provide_data_raises_hookerror_for_invalid_b64_key ...             [OK]
    test_provide_data_raises_hookerror_for_missing_key ...                 [OK]
    test_required_keys ...                                                 [OK]
  HAProxyRequirerTest
    test_required_keys ...                                                 [OK]
lib.relations.tests.test_hosted
  HostedRequirerTest
    test_invalid_deployment_mode ...                                       [OK]
    test_not_related ...                                                   [OK]
    test_related ...                                                       [OK]
    test_required_keys ...                                                 [OK]
lib.relations.tests.test_landscape
  LandscapeLeaderContextTest
    test_fresh ...                                                         [OK]
    test_stored ...                                                        [OK]
  LandscapeProviderTest
    test_provide_data ...                                                  [OK]
    test_provide_data_not_leader ...                                       [OK]
    test_required_keys ...                                                 [OK]
  LandscapeRequirerTest
    test_is_leader ...                                                     [OK]
    test_is_not_leader ...                                                 [OK]
    test_not_ready ...                                                     [OK]
    test_required_keys ...                                                 [OK]
    test_split_brain ...                                                   [OK]
lib.relations.tests.test_postgresql
  PostgreSQLRequirerTest
    test_discard_non_master_states ...                                     [OK]
    test_local_unit_in_allowed_units ...                                   [OK]
    test_required_keys ...                                                 [OK]
lib.relations.tests.test_rabbitmq
  RabbitMQProviderTest
    test_provide_data ...                                                  [OK]
    test_required_keys ...                                                 [OK]
  RabbitMQRequirerTest
    test_required_keys ...                                                 [OK]
lib.tests.test_apt
  AptTest
    test_install ...                                                       [OK]
    test_install_with_local_tarball ...                                    [OK]
    test_local_tarball ...                                                 [OK]
    test_local_tarball_not_new ...                                         [OK]
    test_no_source ...                                                     [OK]
    test_packages ...                                                      [OK]
    test_set_sources ...                                                   [OK]
    test_set_sources_not_changed ...                                       [OK]
    test_set_sources_replace ...                                           [OK]
    test_set_sources_sample_hashids ...                                    [OK]
lib.tests.test_install
  InstallHookTest
    test_pre_install_hooks ...                                           [FAIL]
    test_run ...                                                           [OK]
lib.tests.test_migrate_schema
  MigrateSchemaActionTest
    test_run ...                                                           [OK]
lib.tests.test_paths
  PathsTest
    test_config_link ...                                                   [OK]
    test_default_file ...                                                  [OK]
    test_service_conf_default ...                                          [OK]
    test_service_conf_with_root_dir ...                                    [OK]
lib.tests.test_pause
  PauseActionTest
    test_run ...                                                           [OK]
lib.tests.test_resume
  ResumeActionTest
    test_run ...                                                           [OK]
lib.tests.test_services
  ServicesHookTest
    test_amqp_relation_not_ready ...                                       [OK]
    test_apt_source ...                                                    [OK]
    test_db_relation_not_ready ...                                         [OK]
    test_license_file ...                                                  [OK]
    test_ready ...                                                         [OK]
    test_ready_with_non_standalone_deployment_mode ...                     [OK]
    test_ready_with_openid_configuration ...                               [OK]
    test_ready_write_ssl_cert ...                                          [OK]
    test_remote_leader_not_ready ...                                       [OK]
    test_remote_leader_ready ...                                           [OK]
    test_ssl_cert_changed ...                                              [OK]
    test_website_relation_provide ...                                      [OK]
lib.tests.test_templates
  LandscapeDefaultsTest
    test_render_deployed_from ...                                          [OK]
    test_render_juju_sync ...                                              [OK]
    test_render_juju_sync_not_leader ...                                   [OK]
    test_render_juju_sync_not_standalone ...                               [OK]
    test_render_on_leader ...                                              [OK]
    test_render_on_non_leader ...                                          [OK]
    test_render_package_search ...                                         [OK]
    test_render_package_search_not_leader ...                              [OK]
    test_render_service_count ...                                          [OK]
  ServiceConfTest
    test_render ...                                                        [OK]
    test_render_with_config_provided_root_url ...                          [OK]
    test_render_with_haproxy_address_as_root_url ...                       [OK]
    test_render_with_openid ...                                            [OK]
    test_render_with_package_search_on_leader ...                          [OK]
    test_render_with_package_search_on_non_leader ...                      [OK]
lib.tests.test_upgrade
  UpgradeActionTest
    test_run ...                                                           [OK]
lib.tests.test_utils
  IsValidURLTestCase
    test_correct_url_is_validated ...                                      [OK]
    test_http_or_https_protocol ...                                        [OK]
    test_missing_protocol ...                                              [OK]
    test_missing_protocol_delimiter ...                                    [OK]
    test_missing_trailing_slash ...                                        [OK]

===============================================================================
[FAIL]
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/var/jenkins/workspace/latch-test/latchcMzz9M/source_dir/lib/tests/test_install.py", line 41, in test_pre_install_hooks
    [(("/bin/sh", "-c", hook), {})], self.subprocess.calls)
  File "/usr/lib/python2.7/unittest/case.py", line 515, in assertEqual
    assertion_func(first, second, msg=msg)
  File "/usr/lib/python2.7/unittest/case.py", line 744, in assertListEqual
    self.assertSequenceEqual(list1, list2, msg, seq_type=list)
  File "/usr/lib/python2.7/unittest/case.py", line 726, in assertSequenceEqual
    self.fail(msg)
  File "/usr/lib/python2.7/unittest/case.py", line 412, in fail
    raise self.failureException(msg)
exceptions.AssertionError: Lists differ: [(('/bin/sh', '-c', '/tmp/tmpb... != [('/tmp/tmpb2pL3n/exec.d/foo/c...

First differing element 0:
(('/bin/sh', '-c', '/tmp/tmpb2pL3n/exec.d/foo/charm-pre-install'), {})
('/tmp/tmpb2pL3n/exec.d/foo/charm-pre-install', {'shell': True})

- [(('/bin/sh', '-c', '/tmp/tmpb2pL3n/exec.d/foo/charm-pre-install'), {})]
?   ------------------                                             -

+ [('/tmp/tmpb2pL3n/exec.d/foo/charm-pre-install', {'shell': True})]
?                                                   +++++++++++++

lib.tests.test_install.InstallHookTest.test_pre_install_hooks
-------------------------------------------------------------------------------
Ran 102 tests in 0.661s

FAILED (failures=1, successes=101)
make[1]: *** [test] Error 1
make[1]: Leaving directory `/var/jenkins/workspace/latch-test/latchcMzz9M/source_dir'
make: *** [ci-test] Error 2

review: Needs Fixing (test results)

Revision history for this message

Chad Smith (chad.smith) wrote on 2015-05-28:

#

Couple of minor points and a request for either an extended unit test or additional unit tests for fail case and ignore case for the CHARM_PRE_INSTALL_PATTERN.

review: Approve

lp://qastaging/~free.ekanayaka/landscape-charm/pre-install-hooks updated on 2015-05-29

293. By Free Ekanayaka on 2015-05-29: Merge from trunk
294. By Free Ekanayaka on 2015-05-29: Address review comments

Revision history for this message

Free Ekanayaka (free.ekanayaka) on 2015-05-29:

#

Revision history for this message

Free Ekanayaka (free.ekanayaka) on 2015-05-29:

#

Landscape Charm

Merge lp://qastaging/~free.ekanayaka/landscape-charm/pre-install-hooks into lp://qastaging/~landscape/landscape-charm/trunk

Commit message

Description of the change

Preview Diff

Subscribers