Merge lp:~freyes/maas-deployer/fix-ls into lp:~maas-deployers/maas-deployer/next

[Felipe Reyes]

In Xenial the output of the path in ls for no such file or directory is
surrounded by single quotes, while in Trusty is not. This patch checks
for both possible outputs and if none is found, then the test is marked
as fail.

[Billy Olsen (billy-olsen)]

LGTM

review: Approve

=== modified file 'maas_deployer/tests/test_utils.py'
--- maas_deployer/tests/test_utils.py	2015-09-14 09:24:08 +0000
+++ maas_deployer/tests/test_utils.py	2016-08-01 19:45:22 +0000
@@ -85,9 +85,20 @@
             try:
                 util.execc(cmd1, pipedcmds=[cmd2])
             except subprocess.CalledProcessError as exc:
-                self.assertEqual(exc.output,
-                                 "ls: cannot access %s: No such file or "
-                                 "directory\n" % (os.path.join(tmpdir, '1')))
+                test_passed = False
+                for msg in [("ls: cannot access %s: No such file or "
+                             "directory\n"),
+                            ("ls: cannot access '%s': No such file or "
+                             "directory\n")]:
+                    try:
+                        self.assertEqual(exc.output,
+                                         msg % (os.path.join(tmpdir, '1')))
+                        test_passed = True
+                        break
+                    except AssertionError:
+                        pass
+
+                self.assertTrue(test_passed, exc.output)
                 self.assertEqual(exc.returncode, 2)
             else:
                 raise UnitTestException("Exception not raised")