Merge lp:~simpoir/landscape-client/py3fix-apt-sources-replace into lp:~landscape/landscape-client/trunk

[Simon Poirier]

Assume byte for content of apt-sources, as sent by the server.

Assume byte for content of apt-sources, as sent by the server.

Testing instructions:

source ./dev/setup-api
landscape-api create-repository-profile repo_prof
landscape-api associate-repository-profile repo_prof --all-computers
approve the activity in the UI
verify the content of /etc/apt/sources.list.d/landscape-repo_prof.list

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1014
Branch: lp:~simpoir/landscape-client/py3fix-apt-sources-replace
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3871/

review: Approve (test results)

[Eric Snow (ericsnowcurrently)]

review: Needs Information

[Eric Snow (ericsnowcurrently)]

Other than a small nit, LGTM.

review: Approve

[lp:~simpoir/landscape-client/py3fix-apt-sources-replace]

1015. By Simon Poirier on 2017-04-11

fix docstring sample

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1015
Branch: lp:~simpoir/landscape-client/py3fix-apt-sources-replace
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3873/

review: Approve (test results)

[Chad Smith (chad.smith)]

Tested w/ multiple apt sources in the repo. worked fine against existing landscape installations.

review: Approve

=== modified file 'landscape/manager/aptsources.py'
--- landscape/manager/aptsources.py	2017-04-05 14:19:27 +0000
+++ landscape/manager/aptsources.py	2017-04-11 22:00:55 +0000
@@ -69,18 +69,18 @@
         {"sources": [
           {"name": "repository-name",
            "content":
-              "deb http://archive.ubuntu.com/ubuntu/ maverick main\n\
-              "deb-src http://archive.ubuntu.com/ubuntu/ maverick main"}
+              b"deb http://archive.ubuntu.com/ubuntu/ maverick main\n"
+              b"deb-src http://archive.ubuntu.com/ubuntu/ maverick main"}
           {"name": "repository-name-dev",
            "content":
-              "deb http://archive.ubuntu.com/ubuntu/ maverick universe\n\
-              "deb-src http://archive.ubuntu.com/ubuntu/ maverick universe"}],
-         "gpg-keys": ["-----BEGIN PGP PUBLIC KEY BLOCK-----\n\
-                      XXXX
-                      -----END PGP PUBLIC KEY BLOCK-----",
-                      "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\
-                      YYY
-                      -----END PGP PUBLIC KEY BLOCK-----"]}
+              b"deb http://archive.ubuntu.com/ubuntu/ maverick universe\n"
+              b"deb-src http://archive.ubuntu.com/ubuntu/ maverick universe"}],
+         "gpg-keys": ["-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
+                      "XXXX"
+                      "-----END PGP PUBLIC KEY BLOCK-----",
+                      "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
+                      "YYY"
+                      "-----END PGP PUBLIC KEY BLOCK-----"]}
         """
         deferred = succeed(None)
         for key in message["gpg-keys"]:
@@ -128,7 +128,7 @@
         for source in sources:
             filename = os.path.join(self.SOURCES_LIST_D,
                                     "landscape-%s.list" % source["name"])
-            with open(filename, "w") as sources_file:
+            with open(filename, "wb") as sources_file:
                 sources_file.write(source["content"])
             os.chmod(filename, 0o644)
         return self._run_reporter().addCallback(lambda ignored: None)

=== modified file 'landscape/manager/tests/test_aptsources.py'
--- landscape/manager/tests/test_aptsources.py	2017-04-05 15:59:20 +0000
+++ landscape/manager/tests/test_aptsources.py	2017-04-11 22:00:55 +0000
@@ -53,7 +53,7 @@
 
         self.manager.dispatch_message(
             {"type": "apt-sources-replace",
-             "sources": [{"name": "bla", "content": ""}],
+             "sources": [{"name": "bla", "content": b""}],
              "gpg-keys": [],
              "operation-id": 1})
 
@@ -73,7 +73,7 @@
 
         self.manager.dispatch_message(
             {"type": "apt-sources-replace",
-             "sources": [{"name": "bla", "content": ""}],
+             "sources": [{"name": "bla", "content": b""}],
              "gpg-keys": [],
              "operation-id": 1})
 
@@ -97,7 +97,7 @@
 
         self.manager.dispatch_message(
             {"type": "apt-sources-replace",
-             "sources": [{"name": "bla", "content": ""}],
+             "sources": [{"name": "bla", "content": b""}],
              "gpg-keys": [],
              "operation-id": 1})
 
@@ -153,7 +153,7 @@
 
             self.manager.dispatch_message(
                 {"type": "apt-sources-replace",
-                 "sources": [{"name": "bla", "content": ""}],
+                 "sources": [{"name": "bla", "content": b""}],
                  "gpg-keys": [],
                  "operation-id": 1})
 
@@ -183,7 +183,7 @@
 
         self.manager.dispatch_message(
             {"type": "apt-sources-replace",
-             "sources": [{"name": "bla", "content": ""}],
+             "sources": [{"name": "bla", "content": b""}],
              "gpg-keys": [],
              "operation-id": 1})
 
@@ -230,8 +230,8 @@
         For every sources listed in the sources field of the message,
         C{AptSources} creates a file with the content in sources.list.d.
         """
-        sources = [{"name": "dev", "content": "oki\n"},
-                   {"name": "lucid", "content": "doki\n"}]
+        sources = [{"name": "dev", "content": b"oki\n"},
+                   {"name": "lucid", "content": b"doki\n"}]
         self.manager.dispatch_message(
             {"type": "apt-sources-replace", "sources": sources, "gpg-keys": [],
              "operation-id": 1})