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

Proposed by Brian Murray
Status: Merged
Merged at revision: 90
Proposed branch: lp:~brian-murray/auto-upgrade-testing/use-proposed-dist-upgrader
Merge into: lp:auto-upgrade-testing
Diff against target: 80 lines (+11/-11)
4 files modified
debian/tests/upgrade (+5/-5)
upgrade_testing/provisioning/_provisionconfig.py (+1/-1)
upgrade_testing/provisioning/backends/_ssh.py (+1/-1)
upgrade_testing/provisioning/backends/_touch.py (+4/-4)
To merge this branch: bzr merge lp:~brian-murray/auto-upgrade-testing/use-proposed-dist-upgrader
Reviewer Review Type Date Requested Status
platform-qa-bot continuous-integration Approve
Jean-Baptiste Lallement Pending
Review via email: mp+367288@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Needs Fixing (continuous-integration)
91. By Brian Murray

resolve flake8 errors which are causing package build failures

Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Brian Murray (brian-murray) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
271 echo ""271 echo ""
272 fi272 fi
273273
274 local version=$(do-release-upgrade -c | awk '/New release/ {print $3}' | tr -d \')274 local version=$(do-release-upgrade -p -c | awk '/New release/ {print $3}' | tr -d \')
275 if [ ! "${version}" ]; then275 if [ ! "${version}" ]; then
276 # Lets try for a development version276 # Lets try for a development version
277 local version=$(do-release-upgrade -c -d | awk '/New release/ {print $3}' | tr -d \')277 local version=$(do-release-upgrade -p -c -d | awk '/New release/ {print $3}' | tr -d \')
278 echo "${version}"278 echo "${version}"
279 else279 else
280 echo "${version}"280 echo "${version}"
@@ -379,11 +379,11 @@
379 sed 's/Prompt=lts/Prompt=normal/' -i /etc/update-manager/release-upgrades379 sed 's/Prompt=lts/Prompt=normal/' -i /etc/update-manager/release-upgrades
380 fi380 fi
381381
382 local version=$(do-release-upgrade -c | awk '/New release/ {print $3}' | tr -d \')382 local version=$(do-release-upgrade -p -c | awk '/New release/ {print $3}' | tr -d \')
383 if [ -z "${version}" ]; then383 if [ -z "${version}" ]; then
384 do-release-upgrade -d -f DistUpgradeViewNonInteractive384 do-release-upgrade -p -d -f DistUpgradeViewNonInteractive
385 else385 else
386 do-release-upgrade -f DistUpgradeViewNonInteractive386 do-release-upgrade -p -f DistUpgradeViewNonInteractive
387 fi387 fi
388388
389 STATUS=$?389 STATUS=$?
390390
=== 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 @@
311311
312 for token in token_strings:312 for token in token_strings:
313 result = re.sub(313 result = re.sub(
314 '\${}'.format(token),314 r'\${}'.format(token),
315 token_lookup[token](),315 token_lookup[token](),
316 original_string316 original_string
317 )317 )
318318
=== 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 @@
208 child = pexpect.spawn(cmd)208 child = pexpect.spawn(cmd)
209 try:209 try:
210 index = child.expect(210 index = child.expect(
211 ['\$', 'password', 'denied'], timeout=TIMEOUT_CONNECT)211 [r'\$', 'password', 'denied'], timeout=TIMEOUT_CONNECT)
212 except (pexpect.exceptions.TIMEOUT, pexpect.exceptions.EOF):212 except (pexpect.exceptions.TIMEOUT, pexpect.exceptions.EOF):
213 index = -1213 index = -1
214 finally:214 finally:
215215
=== 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 @@
4747
48 """48 """
49 return (49 return (
50 _device_connected(self.serial) and50 _device_connected(self.serial)
51 self._device_in_available_state()51 and self._device_in_available_state()
52 )52 )
5353
54 def _device_in_available_state(self):54 def _device_in_available_state(self):
55 return (55 return (
56 self._device_in_required_state() and56 self._device_in_required_state()
57 _device_has_network_connection()57 and _device_has_network_connection()
58 )58 )
5959
60 def _device_in_required_state(self):60 def _device_in_required_state(self):

Subscribers

People subscribed via source and target branches