Merge lp:~dobey/ubuntuone-client/fix-984407-3-0 into lp:ubuntuone-client/stable-3-0

[dobey]

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

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'tests/platform/windows/test_os_helper.py'
--- tests/platform/windows/test_os_helper.py	2012-04-09 20:07:05 +0000
+++ tests/platform/windows/test_os_helper.py	2012-05-16 22:05:30 +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/windows/os_helper.py'
--- ubuntuone/platform/windows/os_helper.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/windows/os_helper.py	2012-05-16 22:05:30 +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()