From commits-return-27762-archive-asf-public=cust-asf.ponee.io@geode.apache.org Wed Aug 1 18:51:07 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 34A81180634 for ; Wed, 1 Aug 2018 18:51:07 +0200 (CEST) Received: (qmail 43544 invoked by uid 500); 1 Aug 2018 16:51:06 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 43535 invoked by uid 99); 1 Aug 2018 16:51:06 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2018 16:51:06 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id AD3368078A; Wed, 1 Aug 2018 16:51:05 +0000 (UTC) Date: Wed, 01 Aug 2018 16:51:05 +0000 To: "commits@geode.apache.org" Subject: [geode] branch develop updated: GEODE-5497: Fix broken tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153314226469.26474.13929849107372216690@gitbox.apache.org> From: jensdeppe@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: 1554e6fe013e25bf448a565ed601b36e859b6c90 X-Git-Newrev: a7bf51429cc6ddb19da62fc1c90f09f242b9b018 X-Git-Rev: a7bf51429cc6ddb19da62fc1c90f09f242b9b018 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new a7bf514 GEODE-5497: Fix broken tests a7bf514 is described below commit a7bf51429cc6ddb19da62fc1c90f09f242b9b018 Author: Jens Deppe AuthorDate: Wed Aug 1 09:50:48 2018 -0700 GEODE-5497: Fix broken tests --- .../geode/internal/cache/backup/BackupInspectorIntegrationTest.java | 2 +- .../apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java index 313567a..3f66f20 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/BackupInspectorIntegrationTest.java @@ -90,7 +90,7 @@ public class BackupInspectorIntegrationTest { assertThat(inspector.isIncremental()).isTrue(); Set oplogFiles = inspector.getIncrementalOplogFileNames(); assertThat(oplogFiles.isEmpty()).isFalse(); - assertThat(oplogFiles).hasSize(2); + assertThat(oplogFiles).hasSize(3); assertThat(oplogFiles.contains(CRF_FILE_NAME)).isTrue(); assertThat(oplogFiles.contains(DRF_FILE_NAME)).isTrue(); validateIncrementalBackupScript(inspector); diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java index a3536e5..e6c4b57 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/backup/UnixScriptGeneratorTest.java @@ -83,8 +83,9 @@ public class UnixScriptGeneratorTest { scriptGenerator.writeCopyFile(writer, source, destinaiton); writer.flush(); List output = Files.readAllLines(outputFile.toPath()); - assertThat(output).hasSize(1); - assertThat(output).containsExactly("cp -p '" + source + "' '" + destinaiton + "'"); + assertThat(output).hasSize(2); + assertThat(output).containsExactly("mkdir -p '" + source.getParent() + "'", + "cp -p '" + source + "' '" + destinaiton + "'"); } @Test