Merge lp:~diegosarmentero/ubuntuone-dev-tools/temp-bytes into lp:ubuntuone-dev-tools

[Diego Sarmentero]

- Making temp-directory to be bytes to avoid encoding problems in tests.

[dobey (dobey)]

Can you please file a bug for this (temp directory being unicode when it should be bytes), and add a regression test so that we can ensure it doesn't pop up again? Thanks.

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-dev-tools/temp-bytes]

98. By Diego Sarmentero on 2012-09-28

Adding regression test

99. By Diego Sarmentero on 2012-09-28

fixing docstring

100. By Diego Sarmentero on 2012-09-28

fixing import order

[dobey (dobey)]

62 + def test_check_temp_directory_is_bytes(self):
63 + """Check that the temp-directory value is bytes."""
64 + base_options = runners.BaseTestOptions()
65 + self.assertIsInstance(base_options.optParameters[5][2], str)

Instead of poking at this directly, I think it's probably better to perhaps check that self.tempdir.decode('utf-8') succeeds. If the parameters list changes in the future, your test will break, even when it shouldn't, as it depends on the order of the parameters. Also, I think your test will fail on python3, as the instance of that parameter should be 'bytes' instead of 'str' there at least. It's possible we may need to check the Python version and do things differently on 2 and 3 in the test, as well, but I think the .decode test should be enough for now.

[lp:~diegosarmentero/ubuntuone-dev-tools/temp-bytes]

101. By Diego Sarmentero on 2012-09-28

improve tests

102. By Diego Sarmentero on 2012-09-28

updating test

103. By Diego Sarmentero on 2012-09-28

removing unncessary lint ignore

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/devtools/runners/__init__.py'
--- ubuntuone/devtools/runners/__init__.py	2012-08-27 19:15:04 +0000
+++ ubuntuone/devtools/runners/__init__.py	2012-09-28 17:48:20 +0000
@@ -198,7 +198,7 @@
                      ['ignore-modules', 'i', '', None],
                      ['ignore-paths', 'p', '', None],
                      ['runner', None, 'txrunner', None],
-                     ['temp-directory', None, '_trial_temp', None],
+                     ['temp-directory', None, b'_trial_temp', None],
                      ]
 
     def __init__(self, *args, **kwargs):

=== added directory 'ubuntuone/devtools/runners/tests'
=== added file 'ubuntuone/devtools/runners/tests/__init__.py'
--- ubuntuone/devtools/runners/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/devtools/runners/tests/__init__.py	2012-09-28 17:48:20 +0000
@@ -0,0 +1,1 @@
+"""Test the dev tools."""

=== added file 'ubuntuone/devtools/runners/tests/test_base.py'
--- ubuntuone/devtools/runners/tests/test_base.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/devtools/runners/tests/test_base.py	2012-09-28 17:48:20 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 *-*
+#
+# Copyright 2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Test the base module."""
+
+from ubuntuone.devtools.testcases import BaseTestCase
+
+
+class BaseRunnersTestCase(BaseTestCase):
+    """Test the runners module."""
+
+    def test_check_temp_directory_is_bytes(self):
+        """Check that the temp directory value is bytes."""
+        self.assertIsInstance(self.tmpdir, bytes)