Merge pull request #93 from semi-technologies/backup_test_fix_WVT-363_rebased

fix backup tests

Author: aliszka

backup/journey.test.js

@@ -456,11 +456,12 @@ describe("fail restoring backup for existing class", () => {
       .withIncludeClassNames(PIZZA_CLASS_NAME)
       .withBackend(BACKEND)
       .withBackupId(BACKUP_ID)
+      .withWaitForCompletion(true)
       .do()
-      .then(() => fail("should fail on restore backup"))
-      .catch(err => {
-        expect(err).toContain(422);
-        expect(err).toContain(PIZZA_CLASS_NAME);
+      .then(resp => {
+        expect(resp.error).toContain("already exists");
+        expect(resp.error).toContain(PIZZA_CLASS_NAME);
+        expect(resp.status).toBe(weaviate.backup.RestoreStatus.FAILED);
       });
   });
 
@@ -586,7 +587,6 @@ describe("fail checking restore status for not started restore", () => {
       .then(() => fail("should fail on restore status"))
       .catch(err => {
         expect(err).toContain(404);
-        expect(err).toContain(BACKEND);
         expect(err).toContain(BACKUP_ID);
       });
   });
@@ -731,11 +731,11 @@ function assertThatAllSoupsExist(client) {
 
 function assertThatAllFoodObjectsExist(client, className, number) {
   return client.graphql.get()
-      .withClassName(className)
-      .withFields("name")
-      .do()
-      .then(data => expect(data.data.Get[className].length).toBe(number))
-      .catch(err => fail(number + " objects should exist: " + err));
+    .withClassName(className)
+    .withFields("name")
+    .do()
+    .then(data => expect(data.data.Get[className].length).toBe(number))
+    .catch(err => fail(number + " objects should exist: " + err));
 }
 
 function randomBackupId() {

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   weaviate:
-    image: semitechnologies/weaviate:1.15.2
+    image: semitechnologies/weaviate:latest@sha256:6b4d510d59f57bd00d6b1cb5957db2bc80963e59355cd4dc8935c7c6f2df4559
     restart: on-failure:0
     ports:
       - "8080:8080"
@@ -13,6 +13,8 @@ services:
       DEFAULT_VECTORIZER_MODULE: text2vec-contextionary
       ENABLE_MODULES: text2vec-contextionary,backup-filesystem
       BACKUP_FILESYSTEM_PATH: "/tmp/backups"
+      CLUSTER_GOSSIP_BIND_PORT: "7100"
+      CLUSTER_DATA_BIND_PORT: "7101"
   contextionary:
     image: semitechnologies/contextionary:en0.16.0-v1.1.0
     ports:

misc/journey.test.js

@@ -1,4 +1,5 @@
 const weaviate = require("../index");
+
 describe("misc endpoints", () => {
   const client = weaviate.client({
     scheme: "http",