Skip to content

Commit 1154360

Browse files
author
Varun Deep Saini
committed
fixed tests
Signed-off-by: Varun Deep Saini <varun.23bcs10048@ms.sst.scaler.com>
1 parent 6640cee commit 1154360

File tree

7 files changed

+25
-8
lines changed

7 files changed

+25
-8
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
RecordRequests = false
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
>>> [CLI] bundle deploy
3+
Building my_artifact...
4+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-cmd/default/files...
5+
Deploying resources...
6+
Updating deployment state...
7+
Deployment complete!
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
>>> [CLI] bundle deploy
3+
Building my_artifact...
4+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-cmd/default/files...
5+
Deploying resources...
6+
Deployment complete!
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
2-
>>> [CLI] bundle deploy
3-
Building my_artifact...
4-
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-cmd/default/files...
5-
Deploying resources...
6-
Deployment complete!
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
trace $CLI bundle deploy
1+
trace $CLI bundle deploy > out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1

acceptance/bundle/deploy/wal/test.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@ Exit code:"""
2222
Old = 'Exit code: (137|1)'
2323
New = 'Exit code: [KILLED]'
2424

25+
# On Windows, no bash "Killed" message appears when CLI has produced output before termination.
26+
# Insert [PROCESS_KILLED] between last output line and exit code for consistency.
27+
[[Repls]]
28+
Old = '(Deploying resources\.\.\.)\n\nExit code: \[KILLED\]'
29+
New = """${1}
30+
[PROCESS_KILLED]
31+
32+
Exit code: [KILLED]"""
33+
2534
[[Repls]]
2635
Old = "\r"
2736
New = ''

bundle/direct/dstate/wal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ func recoverFromWAL(ctx context.Context, statePath string, db *Database) (bool,
321321
return false, nil
322322
}
323323

324-
logRecoveryProgress(ctx, fmt.Sprintf("Recovering state from WAL file: %s", relativePathForLog(walPath(statePath))))
324+
logRecoveryProgress(ctx, "Recovering state from WAL file: "+relativePathForLog(walPath(statePath)))
325325
walLogPath := relativePathForLog(walPath(statePath))
326326
for _, corrupted := range replayResult.corruptedEntries {
327327
log.Warnf(ctx, "Could not read state file WAL entry in %s: line %d: %s: %v", walLogPath, corrupted.lineNumber, corrupted.rawLine, corrupted.parseErr)

0 commit comments

Comments
 (0)