Merge lp:~brian.curtin/ubuntuone-client/fix984407-windows-is_root into lp:ubuntuone-client

[Brian Curtin]

- No longer check whether or not we are actually running as administrator on Windows

Fix #984407 and an issue with test builds on Jenkins. Being too smart and selective with the is_root call has caused problems for a while, and it's not overly useful for it to be accurate anyway.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~brian.curtin/ubuntuone-client/fix984407-windows-is_root into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.68
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.3
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking how to print strings... printf
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
...

[lp:~brian.curtin/ubuntuone-client/fix984407-windows-is_root]

1243. By Brian Curtin on 2012-05-11

Remove unused imports

=== modified file 'tests/platform/os_helper/test_windows.py'
--- tests/platform/os_helper/test_windows.py	2012-04-27 20:38:13 +0000
+++ tests/platform/os_helper/test_windows.py	2012-05-11 17:23:17 +0000
@@ -32,7 +32,6 @@
 import os
 import shutil
 import sys
-import platform
 
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
@@ -482,19 +481,10 @@
 
 
 class TestIsRoot(TestCase):
-
     """Tests for the is_root function."""
 
-    def test_isanadmin_called(self):
-        """Test that shell.IsUserAnAdmin is called."""
-        expected = object()
-        self.patch(os_helper.shell, 'IsUserAnAdmin', lambda: expected)
-        actual = os_helper.is_root()
-        self.assertEqual(expected, actual)
-
-    def test_is_root_on_xp(self):
-        """Test that os_helper.is_root always returns False on XP"""
+    def test_is_root(self):
+        """Test that os_helper.is_root always returns False"""
         expected = False
-        self.patch(platform, "version", "5.1.2600")
         actual = os_helper.is_root()
         self.assertEqual(expected, actual)

=== modified file 'ubuntuone/platform/os_helper/windows.py'
--- ubuntuone/platform/os_helper/windows.py	2012-04-27 20:38:13 +0000
+++ ubuntuone/platform/os_helper/windows.py	2012-05-11 17:23:17 +0000
@@ -35,7 +35,6 @@
 import stat
 import sys
 
-from platform import version
 from contextlib import contextmanager
 from functools import wraps
 
@@ -885,13 +884,11 @@
 
 def is_root():
     """Return if the user is running as root."""
-    # On Windows XP (v5.1), always return False. Nearly all users run with
-    # Administrator access, so this would restrict too many users.
-    # On Vista (v6.0) and 7 (v6.1), return the real Administrator value.
-    # The MSDN docs say this may go away in a later version, but look at what
-    # the alternative is: http://bit.ly/rXbIwc
-    is_xp = version()[0] == "5"
-    return False if is_xp else shell.IsUserAnAdmin()
+    # Always return False. Trying to be smart about OS versions and 
+    # only calling Windows APIs under certain conditions has still
+    # proven not to work in some cases. Overall it should not matter
+    # if we know whether we are Administrator or not on Windows.
+    return False
 
 
 @windowspath()