Merge pull request #6 from aleksandra-tarkowska/11465-admin-checks

test adjustment
ximenesuk · Oct 1, 2013 · 61a4e92 · 61a4e92
2 parents 55676c9 + 90714c6
commit 61a4e92
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/components/tools/OmeroWeb/omeroweb/webadmin/tests/test_webadmin.py b/components/tools/OmeroWeb/omeroweb/webadmin/tests/test_webadmin.py
@@ -438,7 +438,6 @@ def test_updateGroups(self):
         self.assertEquals(params['permissions'], permissions)
 
 
-    @pytest.mark.xfail(reason="ticket 11465")
     def test_badUpdateGroup(self):
         conn = self.rootconn
         uuid = conn._sessionUuid
@@ -480,7 +479,12 @@ def test_badUpdateGroup(self):
         # remove user from the group
         params["members"] = [0]
         request = fakeRequest(method="post", params=params)
-        _updateGroup(request, conn, gid)
+
+        try:
+            _updateGroup(request, conn, gid)
+            self.fail("Can't remove user from the group members if this it's hs default group")
+        except omero.ValidationException, ve:
+            pass
 
         # check if group updated
         group = conn.getObject("ExperimenterGroup", gid)