Merge lp:~dobey/ubuntuone-dev-tools/run-with-flakes into lp:ubuntuone-dev-tools

[dobey]

Remove deprecated ubuntuone.devtools.testcase module.
Update deprecated module usage to use ubuntuone.devtools.testcases package.
Fix some warnings from pyflakes.
Run u1lint with pyflakes as well as pylint in run-tests.

Running pyflakes with this branch will require the version of pyflakes packaged in ppa:ubuntuone/nightlies currently.

[Michał Karnicki (karni)]

Looks good.

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'bin/u1lint'
--- bin/u1lint	2012-08-22 15:48:30 +0000
+++ bin/u1lint	2012-10-18 21:23:20 +0000
@@ -45,6 +45,13 @@
 
 SRCDIR = os.environ.get('SRCDIR', os.getcwd())
 
+# Define a dummy WindowsError class to keep pyflakes happy on !Windows
+# In the future we should remove this, when pyflakes handles platform-specific
+# code more correctly by ignoring some warnings while on other platforms.
+if sys.platform != 'win32':
+    class WindowsError(OSError):
+        """Dummy WindowsError wrapper to make pyflakes happy."""
+
 
 class InvalidSetupException(Exception):
     """Raised when the env is not correctly setup."""
@@ -195,17 +202,23 @@
     # pylint: disable=W0612
     for root, dirs, files in os.walk(SRCDIR, topdown=False):
         for filename in files:
-            filepath = "%s/" % root
+            filepath = root + os.path.sep
 
             # Skip files in build/
-            if filepath.startswith("%s/build/" % SRCDIR):
+            builddir = os.path.join(SRCDIR, 'build') + os.path.sep
+            if filepath.startswith(builddir):
                 continue
 
             # Skip protobuf-generated and backup files
-            if filename.endswith("_pb2.py") or filename.endswith("~"):
+            if (filename.endswith("_pb2.py")
+                or filename.endswith("~")
+                or filename.endswith(".bat")
+                ):
                 continue
 
-            if filename.endswith(".py") or filepath.endswith("bin/"):
+            if (filename.endswith(".py")
+                or filepath.endswith("bin" + os.path.sep)
+                ):
                 pyfiles.append(os.path.join(root, filename))
 
     pyfiles.sort()

=== modified file 'run-tests'
--- run-tests	2012-08-27 18:47:56 +0000
+++ run-tests	2012-10-18 21:23:20 +0000
@@ -26,6 +26,9 @@
 $PYTHON bin/u1trial --reactor=twisted -i "test_squid_windows.py" ubuntuone
 echo "Running style checks..."
 $PYTHON bin/u1lint
+# Run with pyflakes as well as pylint
+USE_PYFLAKES="1" $PYTHON bin/u1lint
+
 pep8 --repeat . bin/* --exclude=*.bat,.pc
 rm -rf _trial_temp
 rm -rf .coverage

=== modified file 'ubuntuone/devtools/reactors/qt4.py'
--- ubuntuone/devtools/reactors/qt4.py	2012-03-30 17:44:03 +0000
+++ ubuntuone/devtools/reactors/qt4.py	2012-10-18 21:23:20 +0000
@@ -41,7 +41,7 @@
         # pylint: disable=W0612
         app = QApplication(sys.argv)
         # pylint: enable=W0612
-
+        assert(app)
     try:
         qt4reactor = __import__('qt4reactor', None, None, [''])
     except ImportError:

=== removed file 'ubuntuone/devtools/testcase.py'
--- ubuntuone/devtools/testcase.py	2012-03-30 17:44:03 +0000
+++ ubuntuone/devtools/testcase.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2011-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.
-"""Maintain old API."""
-
-import warnings
-warnings.warn(
-            'Deprecated import path; use ubuntuone.devtools.testcases'
-            'instead.', DeprecationWarning, stacklevel=2)
-
-# pylint: disable=W0401,W0614
-from ubuntuone.devtools.testcases import *
-from ubuntuone.devtools.testcases.dbus import *

=== modified file 'ubuntuone/devtools/testcases/dbus.py'
--- ubuntuone/devtools/testcases/dbus.py	2012-08-28 21:57:24 +0000
+++ ubuntuone/devtools/testcases/dbus.py	2012-10-18 21:23:20 +0000
@@ -34,10 +34,8 @@
 
 from twisted.internet import defer
 
-# lint seems not tow work well when we use decorators
-# pylint:disable=W0611
-from ubuntuone.devtools.testcase import BaseTestCase, skipIf
-# pylint:enable=W0611
+from ubuntuone.devtools.testcases import BaseTestCase, skipIf
+
 # DBusRunner for DBusTestCase using tests
 from ubuntuone.devtools.services.dbus import DBusRunner
 

=== modified file 'ubuntuone/devtools/testcases/squid.py'
--- ubuntuone/devtools/testcases/squid.py	2012-03-30 17:44:03 +0000
+++ ubuntuone/devtools/testcases/squid.py	2012-10-18 21:23:20 +0000
@@ -28,7 +28,7 @@
 # files in the program, then also delete it here.
 """Base squid tests cases and test utilities."""
 
-from ubuntuone.devtools.testcase import BaseTestCase, skipIf
+from ubuntuone.devtools.testcases import BaseTestCase, skipIf
 from ubuntuone.devtools.services.squid import (
     SquidRunner,
     SquidLaunchError,

=== modified file 'ubuntuone/devtools/tests/test_decorators.py'
--- ubuntuone/devtools/tests/test_decorators.py	2012-05-07 17:57:05 +0000
+++ ubuntuone/devtools/tests/test_decorators.py	2012-10-18 21:23:20 +0000
@@ -35,8 +35,8 @@
 from twisted.trial.runner import LoggedSuite
 from twisted.trial.reporter import TestResult
 
-from ubuntuone.devtools import testcase
-from ubuntuone.devtools.testcase import BaseTestCase
+from ubuntuone.devtools import testcases
+from ubuntuone.devtools.testcases import BaseTestCase
 
 OTHER_PLATFORM = {
     "darwin": "win32",
@@ -53,17 +53,17 @@
         self.patch(os, "getenv", new_getenv)
 
         operations_table = (
-            (testcase.skipIf,
+            (testcases.skipIf,
                 (False, "False condition"),
                 (True, "True condition")),
-            (testcase.skipIfOS,
+            (testcases.skipIfOS,
                 (OTHER_PLATFORM[sys.platform], "skipIf other platform"),
                 (sys.platform, "skipIf this platform")),
-            (testcase.skipIfNotOS,
+            (testcases.skipIfNotOS,
                 (sys.platform, "skipIfNot this platform"),
                 (OTHER_PLATFORM[sys.platform],
                     "skipIfNot other platform")),
-            (testcase.skipIfJenkins,
+            (testcases.skipIfJenkins,
                 (OTHER_PLATFORM[sys.platform],
                     "skipIfJenkins other platform"),
                 (sys.platform, "skipIfJenkins this platform")),)
@@ -108,7 +108,7 @@
 
         # Decorate the class.
         # pylint: disable=C0103
-        Foo = testcase.skipTest("testing")(Foo)
+        Foo = testcases.skipTest("testing")(Foo)
         # pylint: enable=C0103
         record = []
         result = TestResult()