Failing tests

Signed-off-by: Rob Stryker <rob@oxbeef.net>

Author: robstryker

test/ui-test/advancedServerTest.ts

@@ -119,7 +119,13 @@ export function deploymentE2ETest(testServers: ServerTestType[]): void {
                     await deployment.removeDeployment();
                     // refresh server
                     server = await serverProvider.getServer(testServer.serverName);
-                    expect(await server.getServerPublishState()).to.eq(PublishState.FULL_PUBLISH_REQUIRED);
+                    const serverPubState = await server.getServerPublishState();
+                    const deployment2 = await server.getDeployment(appName);
+                    const deploymentPubState = deployment2 ? deployment2.getDeploymentPublishState() : undefined;
+                    const serverFullPubRequired = serverPubState === PublishState.FULL_PUBLISH_REQUIRED;
+                    const serverPubSynchronized = serverPubState === PublishState.SYNCHRONIZED;
+                    const deploymentMissing = deploymentPubState === undefined;
+                    expect(serverFullPubRequired || (serverPubSynchronized && deploymentMissing)).to.eq(true);
                     await driver.wait(async () => { return await serverHasDeployment(server, appName) === false; }, 12000);
                 });
 

test/ui-test/basicServerTest.ts

@@ -64,7 +64,7 @@ export function basicServerOperationTest(testServers: ServerTestType[]): void {
                         }
                         expect(fs.existsSync(extractLocation)).to.be.true;
                         try {
-                            const realPath = path.join(extractLocation, 'jboss-eap-7.4');
+                            const realPath = path.join(extractLocation, testServer.serverName);
                             log.info(`Adding new local server at ${realPath}`);
                             await serverProvider.createLocalServer(realPath, testServer.serverName, true);
                         } catch (error) {