Merge lp:~brendan-donegan/checkbox/bug1013537_nmcli_con_up_return_code into lp:checkbox

[Brendan Donegan]

Originally, after calling nmcli con up the script was looking at its output to check for a string to confirm the connection was activated. In Quantal it has no output, so we need to check the return code. Note that I have not used subprocess.call, because that ends up spitting out all of the messages when run in Precise. Instead I do communicate and discard stdout, and then check the returncode property of Popen

[Brendan Donegan (brendan-donegan)]

Also, I could have used 'if !nmcli_con_up.returncode', but I hate to use negation in a situation where I'm checking for success.

[lp:~brendan-donegan/checkbox/bug1013537_nmcli_con_up_return_code]

1440. By Brendan Donegan on 2012-06-15

Put the changes described in the changelog.

[Marc Tardif (cr3)]

Have you tested these changes on Precise too?

review: Needs Information

[Brendan Donegan (brendan-donegan)]

Yes! In fact the better question would be 'have I tested them on Quantal' :)

review: Needs Resubmitting

[Marc Tardif (cr3)]

It seemed that you had already tested Quantal: In Quantal it has no output, so we need to check the return code.

While merging, I renamed stderr to dummy because Popen was not called with stderr=PIPE. So, stderr always contained None which was misleading. No biggie.

review: Approve

[Brendan Donegan (brendan-donegan)]

No problem. In Precise it *does* have an output, but still returns a code all the same - so it works in both just as well

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-13 20:09:23 +0000
+++ debian/changelog	2012-06-15 08:28:19 +0000
@@ -11,6 +11,8 @@
       encoding issues
   * Update touchpad.py to use gsettings instead of deprecated gconf
     (LP: #1004212)
+  * Instead of checking output of nmcli con up in create_connection,
+    check the return code is success instead (LP: #1013537)
 
   [Marc Tardif]
   * [FEATURE] Reworked media_keys_test into key_test, making it more generic

=== modified file 'scripts/create_connection'
--- scripts/create_connection	2012-06-07 14:17:22 +0000
+++ scripts/create_connection	2012-06-15 08:28:19 +0000
@@ -88,7 +88,7 @@
                              stdout=PIPE)
         (stdout, stderr) = nmcli_con_up.communicate()
 
-        if 'state: activated' in stdout.decode():
+        if nmcli_con_up.returncode == 0:
             print("Connection %s activated." % connection)
         else:
             print("Failed to activate %s." % connection)