Merge pull request #485 from bernt-matthias/topic/purge

Add tests for purging users

bioblend/_tests/TestGalaxyUsers.py

@@ -23,10 +23,9 @@ def test_show_user(self):
     #        assert user["nice_total_disk_usage"] == current_user["nice_total_disk_usage"]
     #        assert user["total_disk_usage"] == current_user["total_disk_usage"]
 
+    @test_util.skip_unless_galaxy("release_19.09")  # for user purging
     def test_create_remote_user(self):
         # WARNING: only admins can create users!
-        # WARNING: Users cannot be purged through the Galaxy API, so execute
-        # this test only on a disposable Galaxy instance!
         if not self.gi.config.get_config()["use_remote_user"]:
             self.skipTest("This Galaxy instance is not configured to use remote users")
         new_user_email = "[email protected]"
@@ -36,11 +35,17 @@ def test_create_remote_user(self):
             deleted_user = self.gi.users.delete_user(user["id"])
             assert deleted_user["email"] == new_user_email
             assert deleted_user["deleted"]
+            assert not deleted_user["purged"]
 
+            purged_user = self.gi.users.delete_user(user["id"], purge=True)
+            # email is redacted when purging a user
+            assert purged_user["email"] != new_user_email
+            assert purged_user["deleted"]
+            assert purged_user["purged"]
+
+    @test_util.skip_unless_galaxy("release_19.09")  # for user purging
     def test_create_local_user(self):
         # WARNING: only admins can create users!
-        # WARNING: Users cannot be purged through the Galaxy API, so execute
-        # this test only on a disposable Galaxy instance!
         if self.gi.config.get_config()["use_remote_user"]:
             self.skipTest("This Galaxy instance is not configured to use local users")
         new_username = test_util.random_string()
@@ -52,11 +57,20 @@ def test_create_local_user(self):
         # test a BioBlend GalaxyInstance can be created using username+password
         user_gi = bioblend.galaxy.GalaxyInstance(url=self.gi.base_url, email=new_user_email, password=password)
         assert user_gi.users.get_current_user()["email"] == new_user_email
-        # test deletion
+        # test deletion and purging
         if self.gi.config.get_config()["allow_user_deletion"]:
             deleted_user = self.gi.users.delete_user(new_user["id"])
+            assert deleted_user["username"] == new_username
             assert deleted_user["email"] == new_user_email
             assert deleted_user["deleted"]
+            assert not deleted_user["purged"]
+
+            purged_user = self.gi.users.delete_user(new_user["id"], purge=True)
+            # username and email are redacted when purging a user
+            assert purged_user["username"] != new_username
+            assert purged_user["email"] != new_user_email
+            assert purged_user["deleted"]
+            assert purged_user["purged"]
 
     def test_get_current_user(self):
         user = self.gi.users.get_current_user()
@@ -66,10 +80,9 @@ def test_get_current_user(self):
         assert user["nice_total_disk_usage"] is not None
         assert user["total_disk_usage"] is not None
 
+    @test_util.skip_unless_galaxy("release_19.09")  # for user purging
     def test_update_user(self):
         # WARNING: only admins can create users!
-        # WARNING: Users cannot be purged through the Galaxy API, so execute
-        # this test only on a disposable Galaxy instance!
         if self.gi.config.get_config()["use_remote_user"]:
             self.skipTest("This Galaxy instance is not configured to use local users")
         new_username = test_util.random_string()
@@ -84,8 +97,12 @@ def test_update_user(self):
         assert updated_user["username"] == updated_username
         assert updated_user["email"] == updated_user_email
 
+        # delete and purge user after test (if possile)
         if self.gi.config.get_config()["allow_user_deletion"]:
             self.gi.users.delete_user(new_user_id)
+            purged_user = self.gi.users.delete_user(new_user_id, purge=True)
+            assert purged_user["deleted"]
+            assert purged_user["purged"]
 
     def test_get_user_apikey(self):
         # Test getting the API key of the current user, which surely has one