Merge lp:~dobey/ubuntuone-dev-tools/update-4-0 into lp:ubuntuone-dev-tools/stable-4-0

[dobey]

[Diego Sarmentero]

    - Make temp-directory be bytes to avoid path encoding problems.

[Brian Curtin (brian.curtin)]

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-10-01 21:04:46 +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-10-01 21:04:46 +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-10-01 21:04:46 +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)