Merge lp:~nataliabidart/ubuntuone-windows-installer/run-test-in-linux into lp:ubuntuone-windows-installer

[Natalia Bidart]

- Tests now pass in Linux!

To run the tests, you need to build the SSO project, and to do so you need to use the following branch:

lp:~nataliabidart/ubuntu-sso-client/build-on-linux

Then, you need to point PYTHONPATH to that branch and controlpanel's trunk, and run the suite:

PYTHONPATH=../../../ussoc/build-on-linux/:../../controlpanel/trunk/:. ./run-tests

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Roberto Alsina (ralsina)]

They do!

review: Approve

=== modified file 'run-tests'
--- run-tests	2011-06-22 12:40:19 +0000
+++ run-tests	2011-07-19 00:44:34 +0000
@@ -27,9 +27,9 @@
 fi
 
 style_check() {
-    pylint --ignore ui ubuntuone_installer/
+    u1lint --ignore ubuntuone_installer/gui/qt/ui
     if [ -x `which pep8` ]; then
-        pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat bin/ $MODULE
+        pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat .
     else
         echo "Please install the 'pep8' package."
     fi

=== modified file 'setup.py'
--- setup.py	2011-06-21 16:36:01 +0000
+++ setup.py	2011-07-19 00:44:34 +0000
@@ -20,9 +20,10 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Setup.py: build, distribute, clean."""
 
+# pylint: disable=W0404
+
 import os
 import sys
-import cgi
 
 try:
     import DistUtilsExtra.auto
@@ -43,6 +44,7 @@
 CLEANFILES = [
     MESSAGE_ENTRY, CONSTANTS, POT_FILE,
     'MANIFEST']
+QT_UI_DIR = os.path.join('ubuntuone_installer', 'gui', 'qt', 'ui')
 
 
 def replace_prefix(prefix):
@@ -61,7 +63,7 @@
     def run(self):
         """Do the install.
 
-        Read from *.service.in and generate .service files with reeplacing
+        Read from *.service.in and generate .service files by replacing
         @prefix@ by self.prefix.
 
         """
@@ -72,7 +74,6 @@
 class InstallerBuild(build_extra.build_extra):
     """Build PyQt (.ui) files and resources."""
 
-    QT_UI_DIR = os.path.join('ubuntuone_installer', 'gui', 'qt', 'ui')
     description = "build PyQt GUIs (.ui) and resources (.qrc)"
 
     def compile_ui(self, ui_file, py_file=None):
@@ -83,7 +84,7 @@
             # python file in the qt moodule
             py_file = os.path.split(ui_file)[1]
             py_file = os.path.splitext(py_file)[0] + '_ui.py'
-            py_file = os.path.join(self.QT_UI_DIR, py_file)
+            py_file = os.path.join(QT_UI_DIR, py_file)
         # we indeed want to catch Exception, is ugly but we need it
         # pylint: disable=W0703
         try:
@@ -109,13 +110,14 @@
         if py_file is None:
             py_file = os.path.split(qrc_file)[1]
             py_file = os.path.splitext(py_file)[0] + '_rc.py'
-            py_file = os.path.join(self.QT_UI_DIR, py_file)
+            py_file = os.path.join(QT_UI_DIR, py_file)
         path = os.getenv('PATH')
         os.putenv('PATH', path + os.path.pathsep + os.path.join(
                   os.path.dirname(PyQt4.__file__), 'bin'))
         if os.system('pyrcc4 "%s" -o "%s"' % (qrc_file, py_file)) > 0:
-            self.warn('Unable to generate python module %s '
-                      + 'for resource file %s', py_file, qrc_file)
+            self.warn('Unable to generate python module {py_file}'
+                      ' for resource file {qrc_file}'.format(
+                      py_file=py_file, qrc_file=qrc_file))
             if not os.path.exists(py_file) or not file(py_file).read():
                 raise SystemExit(1)
         else:
@@ -128,6 +130,7 @@
         f = open(qrc_file, 'w')
         try:
             f.write('<!DOCTYPE RCC><RCC version="1.0">\n')
+            import cgi
             f.write('  <qresource prefix="%s">\n' % cgi.escape(prefix))
             for e in srcfiles:
                 relpath = e[len(basedir) + 1:]
@@ -213,6 +216,12 @@
             if os.path.exists(built_file):
                 os.unlink(built_file)
 
+        for dirpath, _, filenames in os.walk(os.path.join(QT_UI_DIR)):
+            for current_file in filenames:
+                if current_file.endswith('_ui.py') or\
+                                current_file.endswith('_rc.py'):
+                    os.unlink(os.path.join(dirpath, current_file))
+
         DistUtilsExtra.auto.clean_build_tree.run(self)
 
 

=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-07-07 20:32:17 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-07-19 00:44:34 +0000
@@ -20,6 +20,7 @@
 
 import ctypes
 import os
+import sys
 import threading
 import Queue
 
@@ -66,6 +67,7 @@
 
 class LocalFoldersPage(QtGui.QWizardPage):
     """Wizard page to create UDFs in the Windows Installer."""
+
     def __init__(self, parent=None):
         super(LocalFoldersPage, self).__init__(parent)
         self.setTitle(LOCAL_FOLDERS_TITLE)
@@ -97,11 +99,15 @@
 
     def default_folders(self):
         """Return a list of the folders to add by default."""
-        # Special Folder "My Documents"
-        dll = ctypes.windll.shell32
-        buf = ctypes.create_string_buffer(300)
-        dll.SHGetSpecialFolderPathA(None, buf, 0x0005, False)
-        return [buf.value, ]
+        if sys.platform == 'win32':
+            # Special Folder "My Documents"
+            dll = ctypes.windll.shell32
+            buf = ctypes.create_string_buffer(300)
+            dll.SHGetSpecialFolderPathA(None, buf, 0x0005, False)
+            result = [buf.value, ]
+        else:
+            result = ['To be implemented']
+        return result
 
     def add_folder(self, path):
         """Add a folder to the list."""