Merge lp:~brian-murray/auto-upgrade-testing/use-proposed-dist-upgrader into lp:auto-upgrade-testing

[Brian Murray]

debian/tests/upgrade: use the dist-upgrader from -proposed since that has fixes that affect upgrading e.g. LP: #1796193

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:90
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brian-murray/auto-upgrade-testing/use-proposed-dist-upgrader/+merge/367288/+edit-commit-message

https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/48/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-disco-amd64-package/6/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-disco-i386-package/5/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2498/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/48/rebuild

review: Needs Fixing (continuous-integration)

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:90
https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/49/
Executed test runs:
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-disco-amd64-package/7/console
    FAILURE: https://platform-qa-jenkins.ubuntu.com/job/build-disco-i386-package/6/console
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2499/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/49/rebuild

review: Needs Fixing (continuous-integration)

[lp:~brian-murray/auto-upgrade-testing/use-proposed-dist-upgrader]

91. By Brian Murray on 2019-05-13

resolve flake8 errors which are causing package build failures

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:91
https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/50/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-disco-amd64-package/8
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-disco-amd64-package/8/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-disco-i386-package/7
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-disco-i386-package/7/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/2500/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/auto-upgrade-testing-ci/50/rebuild

review: Approve (continuous-integration)

[Brian Murray (brian-murray)]

I went ahead and merged this myself since the change is straight-forward, easy to revert, and patience isn't my strong suit.

=== modified file 'debian/tests/upgrade'
--- debian/tests/upgrade	2017-07-17 11:04:46 +0000
+++ debian/tests/upgrade	2019-05-13 22:33:03 +0000
@@ -271,10 +271,10 @@
         echo ""
     fi
 
-    local version=$(do-release-upgrade -c | awk '/New release/ {print $3}' | tr -d \')
+    local version=$(do-release-upgrade -p -c | awk '/New release/ {print $3}' | tr -d \')
     if [ ! "${version}" ]; then
         # Lets try for a development version
-        local version=$(do-release-upgrade -c -d | awk '/New release/ {print $3}' | tr -d \')
+        local version=$(do-release-upgrade -p -c -d | awk '/New release/ {print $3}' | tr -d \')
         echo "${version}"
     else
         echo "${version}"
@@ -379,11 +379,11 @@
         sed 's/Prompt=lts/Prompt=normal/' -i /etc/update-manager/release-upgrades
     fi
 
-    local version=$(do-release-upgrade -c | awk '/New release/ {print $3}' | tr -d \')
+    local version=$(do-release-upgrade -p -c | awk '/New release/ {print $3}' | tr -d \')
     if [ -z "${version}" ]; then
-        do-release-upgrade -d -f DistUpgradeViewNonInteractive
+        do-release-upgrade -p -d -f DistUpgradeViewNonInteractive
     else
-        do-release-upgrade -f DistUpgradeViewNonInteractive
+        do-release-upgrade -p -f DistUpgradeViewNonInteractive
     fi
 
     STATUS=$?

=== modified file 'upgrade_testing/provisioning/_provisionconfig.py'
--- upgrade_testing/provisioning/_provisionconfig.py	2017-07-12 17:43:50 +0000
+++ upgrade_testing/provisioning/_provisionconfig.py	2019-05-13 22:33:03 +0000
@@ -311,7 +311,7 @@
 
     for token in token_strings:
         result = re.sub(
-            '\${}'.format(token),
+            r'\${}'.format(token),
             token_lookup[token](),
             original_string
         )

=== modified file 'upgrade_testing/provisioning/backends/_ssh.py'
--- upgrade_testing/provisioning/backends/_ssh.py	2017-07-12 17:43:50 +0000
+++ upgrade_testing/provisioning/backends/_ssh.py	2019-05-13 22:33:03 +0000
@@ -208,7 +208,7 @@
         child = pexpect.spawn(cmd)
         try:
             index = child.expect(
-                ['\$', 'password', 'denied'], timeout=TIMEOUT_CONNECT)
+                [r'\$', 'password', 'denied'], timeout=TIMEOUT_CONNECT)
         except (pexpect.exceptions.TIMEOUT, pexpect.exceptions.EOF):
             index = -1
         finally:

=== modified file 'upgrade_testing/provisioning/backends/_touch.py'
--- upgrade_testing/provisioning/backends/_touch.py	2016-05-25 13:26:42 +0000
+++ upgrade_testing/provisioning/backends/_touch.py	2019-05-13 22:33:03 +0000
@@ -47,14 +47,14 @@
 
         """
         return (
-            _device_connected(self.serial) and
-            self._device_in_available_state()
+            _device_connected(self.serial)
+            and self._device_in_available_state()
         )
 
     def _device_in_available_state(self):
         return (
-            self._device_in_required_state() and
-            _device_has_network_connection()
+            self._device_in_required_state()
+            and _device_has_network_connection()
         )
 
     def _device_in_required_state(self):