Added tests for fpm commands

fastn-stack · Aug 24, 2022 · c5fc925 · c5fc925
1 parent 6ea9137
commit c5fc925
Show file tree

Hide file tree

Showing 53 changed files with 370 additions and 0 deletions.
diff --git a/tests/21 - fpm resolve_conflict delete-it/cmd.p1 b/tests/21 - fpm resolve_conflict delete-it/cmd.p1
@@ -0,0 +1,8 @@
+-- fbt:
+cmd: $FBT_CWD/target/debug/fpm --test sync-status && $FBT_CWD/target/debug/fpm --test resolve-conflict --delete-it index.ftd
+output: .clone-state
+
+-- stdout:
+
+CloneEditedRemoteDeleted: index.ftd
+
diff --git a/tests/21 - fpm resolve_conflict delete-it/input/.clone-state/cr b/tests/21 - fpm resolve_conflict delete-it/input/.clone-state/cr
@@ -0,0 +1,5 @@
+1
+2
+3
+4
+5
diff --git a/tests/21 - fpm resolve_conflict delete-it/input/.clone-state/workspace.ftd b/tests/21 - fpm resolve_conflict delete-it/input/.clone-state/workspace.ftd
@@ -0,0 +1,10 @@
+-- import: fpm
+
+-- fpm.client-workspace: FPM.ftd
+version: 1
+deleted: false
+
+
+-- fpm.client-workspace: index.ftd
+version: 1
+deleted: false
diff --git a/tests/21 - fpm resolve_conflict delete-it/input/.remote-state/history.ftd b/tests/21 - fpm resolve_conflict delete-it/input/.remote-state/history.ftd
@@ -0,0 +1,29 @@
+-- import: fpm
+
+
+-- fpm.history: FPM.ftd
+
+--- file-edit:
+timestamp: 1661334297873268000
+operation: Added
+version: 1
+
+Initial sync
+
+
+
+-- fpm.history: index.ftd
+
+--- file-edit:
+timestamp: 1661335012631536200
+operation: Deleted
+version: 2
+
+
+
+--- file-edit:
+timestamp: 1661334297873268000
+operation: Added
+version: 1
+
+Initial sync
diff --git a/tests/21 - fpm resolve_conflict delete-it/input/.remote-state/history/FPM.1.ftd b/tests/21 - fpm resolve_conflict delete-it/input/.remote-state/history/FPM.1.ftd
@@ -0,0 +1,4 @@
+-- import: fpm
+
+-- fpm.package: aviral
+base: www.aviral.com
diff --git a/tests/21 - fpm resolve_conflict delete-it/input/.remote-state/history/index.1.ftd b/tests/21 - fpm resolve_conflict delete-it/input/.remote-state/history/index.1.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world
diff --git a/tests/21 - fpm resolve_conflict delete-it/input/FPM.ftd b/tests/21 - fpm resolve_conflict delete-it/input/FPM.ftd
@@ -0,0 +1,4 @@
+-- import: fpm
+
+-- fpm.package: aviral
+base: www.aviral.com
diff --git a/tests/21 - fpm resolve_conflict delete-it/input/index.ftd b/tests/21 - fpm resolve_conflict delete-it/input/index.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world2
diff --git a/tests/21 - fpm resolve_conflict delete-it/output/cr b/tests/21 - fpm resolve_conflict delete-it/output/cr
@@ -0,0 +1,5 @@
+1
+2
+3
+4
+5
diff --git a/tests/21 - fpm resolve_conflict delete-it/output/workspace.ftd b/tests/21 - fpm resolve_conflict delete-it/output/workspace.ftd
@@ -0,0 +1,5 @@
+-- import: fpm
+
+-- fpm.client-workspace: FPM.ftd
+version: 1
+deleted: false
diff --git a/tests/22 - fpm resolve_conflict revive-it/cmd.p1 b/tests/22 - fpm resolve_conflict revive-it/cmd.p1
@@ -0,0 +1,8 @@
+-- fbt:
+cmd: $FBT_CWD/target/debug/fpm --test sync-status && $FBT_CWD/target/debug/fpm --test resolve-conflict --revive-it index.ftd
+output: .clone-state
+
+-- stdout:
+
+CloneEditedRemoteDeleted: index.ftd
+
diff --git a/tests/22 - fpm resolve_conflict revive-it/input/.clone-state/cr b/tests/22 - fpm resolve_conflict revive-it/input/.clone-state/cr
@@ -0,0 +1,5 @@
+1
+2
+3
+4
+5
diff --git a/tests/22 - fpm resolve_conflict revive-it/input/.clone-state/workspace.ftd b/tests/22 - fpm resolve_conflict revive-it/input/.clone-state/workspace.ftd
@@ -0,0 +1,10 @@
+-- import: fpm
+
+-- fpm.client-workspace: FPM.ftd
+version: 1
+deleted: false
+
+
+-- fpm.client-workspace: index.ftd
+version: 1
+deleted: false
diff --git a/tests/22 - fpm resolve_conflict revive-it/input/.remote-state/history.ftd b/tests/22 - fpm resolve_conflict revive-it/input/.remote-state/history.ftd
@@ -0,0 +1,29 @@
+-- import: fpm
+
+
+-- fpm.history: FPM.ftd
+
+--- file-edit:
+timestamp: 1661248447054446300
+operation: Added
+version: 1
+
+Initial sync
+
+
+
+-- fpm.history: index.ftd
+
+--- file-edit:
+timestamp: 1661248530375928400
+operation: Deleted
+version: 2
+
+
+
+--- file-edit:
+timestamp: 1661248447054446300
+operation: Added
+version: 1
+
+Initial sync
diff --git a/tests/22 - fpm resolve_conflict revive-it/input/.remote-state/history/FPM.1.ftd b/tests/22 - fpm resolve_conflict revive-it/input/.remote-state/history/FPM.1.ftd
@@ -0,0 +1,4 @@
+-- import: fpm
+
+-- fpm.package: aviral
+base: www.avi.com
diff --git a/tests/22 - fpm resolve_conflict revive-it/input/.remote-state/history/index.1.ftd b/tests/22 - fpm resolve_conflict revive-it/input/.remote-state/history/index.1.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world
diff --git a/tests/22 - fpm resolve_conflict revive-it/input/FPM.ftd b/tests/22 - fpm resolve_conflict revive-it/input/FPM.ftd
@@ -0,0 +1,4 @@
+-- import: fpm
+
+-- fpm.package: aviral
+base: www.avi.com
diff --git a/tests/22 - fpm resolve_conflict revive-it/input/index.ftd b/tests/22 - fpm resolve_conflict revive-it/input/index.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world use ours
diff --git a/tests/22 - fpm resolve_conflict revive-it/output/cr b/tests/22 - fpm resolve_conflict revive-it/output/cr
@@ -0,0 +1,5 @@
+1
+2
+3
+4
+5
diff --git a/tests/22 - fpm resolve_conflict revive-it/output/workspace.ftd b/tests/22 - fpm resolve_conflict revive-it/output/workspace.ftd
@@ -0,0 +1,8 @@
+-- import: fpm
+
+-- fpm.client-workspace: FPM.ftd
+version: 1
+deleted: false
+
+
+-- fpm.client-workspace: index.ftd
diff --git a/tests/23 - fpm resolve_conflict use-theirs/cmd.p1 b/tests/23 - fpm resolve_conflict use-theirs/cmd.p1
@@ -0,0 +1,7 @@
+-- fbt:
+cmd: $FBT_CWD/target/debug/fpm --test sync-status && $FBT_CWD/target/debug/fpm --test resolve-conflict --use-theirs index.ftd
+output: .clone-state
+
+-- stdout:
+
+Conflicted: index.ftd
diff --git a/tests/23 - fpm resolve_conflict use-theirs/input/.clone-state/cr b/tests/23 - fpm resolve_conflict use-theirs/input/.clone-state/cr
@@ -0,0 +1,5 @@
+6
+7
+8
+9
+10
diff --git a/tests/23 - fpm resolve_conflict use-theirs/input/.clone-state/workspace.ftd b/tests/23 - fpm resolve_conflict use-theirs/input/.clone-state/workspace.ftd
@@ -0,0 +1,9 @@
+-- import: fpm
+
+-- fpm.client-workspace: FPM.ftd
+version: 1
+deleted: false
+
+
+-- fpm.client-workspace: index.ftd
+version: 1
diff --git a/tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history.ftd b/tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history.ftd
@@ -0,0 +1,29 @@
+-- import: fpm
+
+
+-- fpm.history: FPM.ftd
+
+--- file-edit:
+timestamp: 1661337374048618700
+operation: Added
+version: 1
+
+Initial sync
+
+
+
+-- fpm.history: index.ftd
+
+--- file-edit:
+timestamp: 1661337654050656400
+operation: Updated
+version: 2
+
+
+
+--- file-edit:
+timestamp: 1661337374048618700
+operation: Added
+version: 1
+
+Initial sync
diff --git a/tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history/FPM.1.ftd b/tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history/FPM.1.ftd
@@ -0,0 +1,4 @@
+-- import: fpm
+
+-- fpm.package: aviral
+base: www.aviral.com
diff --git a/tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history/index.1.ftd b/tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history/index.1.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world
diff --git a/tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history/index.2.ftd b/tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history/index.2.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world3
diff --git a/tests/23 - fpm resolve_conflict use-theirs/input/FPM.ftd b/tests/23 - fpm resolve_conflict use-theirs/input/FPM.ftd
@@ -0,0 +1,4 @@
+-- import: fpm
+
+-- fpm.package: aviral
+base: www.aviral.com
diff --git a/tests/23 - fpm resolve_conflict use-theirs/input/index.ftd b/tests/23 - fpm resolve_conflict use-theirs/input/index.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world4
diff --git a/tests/23 - fpm resolve_conflict use-theirs/output/cr b/tests/23 - fpm resolve_conflict use-theirs/output/cr
@@ -0,0 +1,5 @@
+6
+7
+8
+9
+10
diff --git a/tests/23 - fpm resolve_conflict use-theirs/output/workspace.ftd b/tests/23 - fpm resolve_conflict use-theirs/output/workspace.ftd
@@ -0,0 +1,9 @@
+-- import: fpm
+
+-- fpm.client-workspace: FPM.ftd
+version: 1
+deleted: false
+
+
+-- fpm.client-workspace: index.ftd
+version: 2
diff --git a/tests/24 - fpm resolve_conflict use-ours/cmd.p1 b/tests/24 - fpm resolve_conflict use-ours/cmd.p1
@@ -0,0 +1,7 @@
+-- fbt:
+cmd: $FBT_CWD/target/debug/fpm --test sync-status && $FBT_CWD/target/debug/fpm --test resolve-conflict --use-ours index.ftd
+output: .clone-state
+
+-- stdout:
+
+Conflicted: index.ftd
diff --git a/tests/24 - fpm resolve_conflict use-ours/input/.clone-state/cr b/tests/24 - fpm resolve_conflict use-ours/input/.clone-state/cr
@@ -0,0 +1,5 @@
+6
+7
+8
+9
+10
diff --git a/tests/24 - fpm resolve_conflict use-ours/input/.clone-state/workspace.ftd b/tests/24 - fpm resolve_conflict use-ours/input/.clone-state/workspace.ftd
@@ -0,0 +1,9 @@
+-- import: fpm
+
+-- fpm.client-workspace: FPM.ftd
+version: 1
+deleted: false
+
+
+-- fpm.client-workspace: index.ftd
+version: 1
diff --git a/tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history.ftd b/tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history.ftd
@@ -0,0 +1,29 @@
+-- import: fpm
+
+
+-- fpm.history: FPM.ftd
+
+--- file-edit:
+timestamp: 1661338702933685500
+operation: Added
+version: 1
+
+Initial sync
+
+
+
+-- fpm.history: index.ftd
+
+--- file-edit:
+timestamp: 1661338880439075600
+operation: Updated
+version: 2
+
+
+
+--- file-edit:
+timestamp: 1661338702933685500
+operation: Added
+version: 1
+
+Initial sync
diff --git a/tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history/FPM.1.ftd b/tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history/FPM.1.ftd
@@ -0,0 +1,4 @@
+-- import: fpm
+
+-- fpm.package: aviral
+base: www.aviral.com
diff --git a/tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history/index.1.ftd b/tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history/index.1.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world
diff --git a/tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history/index.2.ftd b/tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history/index.2.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world3
diff --git a/tests/24 - fpm resolve_conflict use-ours/input/FPM.ftd b/tests/24 - fpm resolve_conflict use-ours/input/FPM.ftd
@@ -0,0 +1,4 @@
+-- import: fpm
+
+-- fpm.package: aviral
+base: www.aviral.com
diff --git a/tests/24 - fpm resolve_conflict use-ours/input/index.ftd b/tests/24 - fpm resolve_conflict use-ours/input/index.ftd
@@ -0,0 +1 @@
+-- ftd.text: Hello world4
diff --git a/tests/24 - fpm resolve_conflict use-ours/output/cr b/tests/24 - fpm resolve_conflict use-ours/output/cr
@@ -0,0 +1,5 @@
+6
+7
+8
+9
+10
diff --git a/tests/24 - fpm resolve_conflict use-ours/output/workspace.ftd b/tests/24 - fpm resolve_conflict use-ours/output/workspace.ftd
@@ -0,0 +1,9 @@
+-- import: fpm
+
+-- fpm.client-workspace: FPM.ftd
+version: 1
+deleted: false
+
+
+-- fpm.client-workspace: index.ftd
+version: 2
diff --git a/tests/25 - fpm add/cmd.p1 b/tests/25 - fpm add/cmd.p1
@@ -0,0 +1,7 @@
+-- fbt:
+cmd: $FBT_CWD/target/debug/fpm --test add new.ftd && $FBT_CWD/target/debug/fpm --test sync-status
+output: .clone-state
+
+-- stdout:
+
+Added: new.ftd
diff --git a/tests/25 - fpm add/input/.clone-state/cr b/tests/25 - fpm add/input/.clone-state/cr
@@ -0,0 +1,5 @@
+11
+12
+13
+14
+15
diff --git a/tests/25 - fpm add/input/.clone-state/workspace.ftd b/tests/25 - fpm add/input/.clone-state/workspace.ftd
@@ -0,0 +1,10 @@
+-- import: fpm
+
+-- fpm.client-workspace: FPM.ftd
+version: 1
+deleted: false
+
+
+-- fpm.client-workspace: index.ftd
+version: 1
+deleted: false