Fix DB tests. Cleanup after AddUserTest

services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java

@@ -66,7 +66,7 @@ public class ApplianceBootstrap {
         return true;
     }
 
-    public void createMasterRealmUser(KeycloakSession session, String username, String password) {
+    public void createMasterRealmUser(String username, String password) {
         RealmModel realm = session.realms().getRealm(Config.getAdminRealm());
         if (session.users().getUsersCount(realm) > 0) {
             throw new IllegalStateException("Can't create initial user as users already exists");

services/src/main/java/org/keycloak/services/resources/WelcomeResource.java

@@ -92,7 +92,7 @@ public class WelcomeResource {
             ApplianceBootstrap applianceBootstrap = new ApplianceBootstrap(session);
             if (applianceBootstrap.isNoMasterUser()) {
                 bootstrap = false;
-                applianceBootstrap.createMasterRealmUser(session, username, password);
+                applianceBootstrap.createMasterRealmUser(username, password);
 
                 logger.infov("Created initial admin user with username {0}", username);
                 return createWelcomePage("User created", null);

testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java

@@ -278,7 +278,7 @@ public class KeycloakServer {
             try {
                 session.getTransaction().begin();
                 if (new ApplianceBootstrap(session).isNoMasterUser()) {
-                    new ApplianceBootstrap(session).createMasterRealmUser(session, "admin", "admin");
+                    new ApplianceBootstrap(session).createMasterRealmUser("admin", "admin");
                 }
                 session.getTransaction().commit();
             } finally {

testsuite/integration/src/test/java/org/keycloak/testsuite/adduser/AddUserTest.java

@@ -105,6 +105,9 @@ public class AddUserTest {
 
             assertRoles(accountRoles, "view-profile", "manage-account");
 
+            // User needs to delete himself as other tests rely on "admin" user
+            userResource.remove();
+
             keycloak.close();
 
             assertEquals(0, dir.listFiles().length);