Merge lp:~ralsina/ubuntuone-client/fix_904300 into lp:ubuntuone-client

[Roberto Alsina]

Implement is_root for windows.

Implement is_root for windows.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Can you please add a test for this, patching the shell.IsUserAnAdmin? Thanks!

review: Needs Fixing

[Roberto Alsina (ralsina)]

> Can you please add a test for this, patching the shell.IsUserAnAdmin? Thanks!

Sure, added!

[lp:~ralsina/ubuntuone-client/fix_904300]

1174. By Roberto Alsina on 2012-01-02

test

1175. By Roberto Alsina on 2012-01-02

merged trunk

[Natalia Bidart (nataliabidart)]

Thanks a lot for adding the test, though you should note that if you remove the "return" under the is_root implementation, the test will keep passing.

You can simplify and improve the test by doing something like:

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)

(and remove the set_called def).

What do you think?

review: Needs Fixing

[Roberto Alsina (ralsina)]

> Thanks a lot for adding the test, though you should note that if you remove
> the "return" under the is_root implementation, the test will keep passing.
>
> You can simplify and improve the test by doing something like:
>
> 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)
>
> (and remove the set_called def).
>
> What do you think?

Much better, thanks! Pushed in revno 1176

[lp:~ralsina/ubuntuone-client/fix_904300]

1176. By Roberto Alsina on 2012-01-03

improved test as suggested by nessita

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'tests/platform/windows/test_os_helper.py'
--- tests/platform/windows/test_os_helper.py	2011-12-14 13:17:30 +0000
+++ tests/platform/windows/test_os_helper.py	2012-01-03 13:09:25 +0000
@@ -301,6 +301,7 @@
         self.assertEqual(errno.ENOENT, exc.errno,
                         'Errno should be file not found.')
 
+
 class DecoratorsTestCase(TestCase):
     """Test case for all the validators and transformers."""
 
@@ -428,7 +429,6 @@
         attrs = attrs | FILE_ATTRIBUTE_SYSTEM
         SetFileAttributesW(path, attrs)
 
-
     def test_os_listdir(self):
         """Test the list dir."""
         expected_result = self.dirs + self.files
@@ -466,3 +466,15 @@
 
         self.patch(os_helper, 'GetFileAttributesW', fake_get_attrs)
         self.assertFalse(os_helper.native_is_system_path(self.temp))
+
+
+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)

=== modified file 'ubuntuone/platform/windows/os_helper.py'
--- ubuntuone/platform/windows/os_helper.py	2011-12-13 17:06:17 +0000
+++ ubuntuone/platform/windows/os_helper.py	2012-01-03 13:09:25 +0000
@@ -859,8 +859,10 @@
 
 def is_root():
     """Return if the user is running as root."""
-    # TODO: Do check if we are running as admin
-    return False
+    # This solution works on Windows XP, Vista and 7
+    # The MSDN docs say this may go away in a later version, but look at what
+    # the alternative is: http://bit.ly/rXbIwc
+    return shell.IsUserAnAdmin()
 
 
 @windowspath()