Merge lp:~dmitriis/landscape-client-charm/landscape-client-charm into lp:landscape-client-charm

[Dmitrii Shcherbakov]

Handle py2 and py3 by opening a file in wb mode

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 67
Branch: lp:~dmitriis/landscape-client-charm/landscape-client-charm
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1640/

review: Needs Fixing (test results)

[Dave Jones (waveform)]

Possibly a silly question but why not just change the open() call to write a binary file instead?

[Dmitrii Shcherbakov (dmitriis)]

Well, that's another way to do it.

I could make that change instead.

[Simon Poirier (simpoir)]

I'm with Dave, opening as "wb" would be safer than blindly decoding as utf8, and also closer to the py2 behaviour.

[Dmitrii Shcherbakov (dmitriis)]

Updated the branch accordingly.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 67
Branch: lp:~dmitriis/landscape-client-charm/landscape-client-charm
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1641/

review: Approve (test results)

[Simon Poirier (simpoir)]

+1
I verified charm on both trusty, xenial and bionic and this fix seems to work fine.

review: Approve

[🤖 Landscape Builder (landscape-builder)]

The attempt to merge lp:~dmitriis/landscape-client-charm/landscape-client-charm into lp:landscape-client-charm failed. Below is the output from the failed tests.

./dev/ubuntu-deps
Reading package lists...
Building dependency tree...
Reading state information...
python-flake8 is already the newest version.
python-yaml is already the newest version.
landscape-common is already the newest version.
landscape-common set to manually installed.
The following packages were automatically installed and are no longer required:
  gconf-service gconf-service-backend gconf2 gconf2-common landscape-base
  landscape-client-base libavahi-glib1 libbonobo2-0 libbonobo2-common
  libcanberra0 libgconf-2-4 libgconf2-4 libgnome-keyring-common
  libgnome-keyring0 libgnome2-0 libgnome2-bin libgnome2-common libgnomevfs2-0
  libgnomevfs2-common libidl-common libidl0 liborbit-2-0 liborbit2 libspeechd2
  libtdb1 libvorbisfile3 linux-headers-3.13.0-107
  linux-headers-3.13.0-107-generic linux-image-3.13.0-107-generic
  python3-characteristic python3-configobj python3-landscape-lib
  python3-openssl python3-passlib python3-pyasn1 python3-pyasn1-modules
  python3-service-identity python3-twisted python3-zope.interface
  sound-theme-freedesktop
Use 'apt-get autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 83 not upgraded.
make test lint
make[1]: Entering directory `/var/tmp/tarmac/landscape-client-charm/trunk'
cd hooks && trial test_hooks.py
test_hooks
  py ... [ERROR]

===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/trial/runner.py", line 605, in loadByNames
    things.append(self.findByName(name))
  File "/usr/lib/python2.7/dist-packages/twisted/trial/runner.py", line 408, in findByName
    return filenameToModule(name)
  File "/usr/lib/python2.7/dist-packages/twisted/trial/runner.py", line 93, in filenameToModule
    ret = reflect.namedAny(reflect.filenameToModuleName(fn))
  File "/usr/lib/python2.7/dist-packages/twisted/python/reflect.py", line 303, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/usr/lib/python2.7/dist-packages/twisted/python/reflect.py", line 250, in _importAndCheckStack
    reraise(excValue, excTraceback)
  File "/var/tmp/tarmac/landscape-client-charm/trunk/hooks/test_hooks.py", line 10, in <module>
    from landscape.deployment import Configuration
exceptions.ImportError: No module named deployment

test_hooks.py
-------------------------------------------------------------------------------
Ran 1 tests in 0.025s

FAILED (errors=1)
make[1]: Leaving directory `/var/tmp/tarmac/landscape-client-charm/trunk'

make[1]: *** [test] Error 1
make: *** [ci-test] Error 2

[🤖 Landscape Builder (landscape-builder)]

No approved revision specified.

[Dmitrii Shcherbakov (dmitriis)]

Thanks!

Is there still automation to push it to the charm store? As of now the old version is still the latest one in CS.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2018-02-24 05:26:59 +0000
+++ hooks/hooks.py	2018-11-07 15:09:06 +0000
@@ -214,7 +214,7 @@
     @param certificate Text of the certificate, base64 encoded.
     @param filename Full path to file to write
     """
-    with open(filename, "w") as file:
+    with open(filename, "wb") as file:
         file.write(base64.b64decode(certificate))