fix tests on windows platform

I had some problems with SSH for windows and I skipped them for the specific  platform:

- clones repository with provided keypair
- clones repository with provided keypair from memory
- throws when provided keypair from memory is incorrect
This commit is contained in:
Viktor Borisov 2023-02-24 19:58:12 +07:00
parent b66662f33c
commit bb75589a14
17 changed files with 160 additions and 95 deletions

View file

@ -1 +1 @@
c68ff54aabf660fcdd9a2838d401583fe31249e3
14905459d775f3f56a39ebc2ff081163f7da3529

Binary file not shown.

View file

@ -24,3 +24,4 @@ fc38877b2552ab554752d9a77e1f48f738cca79b 5aecfa0fb97eadaac050ccb99f03c3fb65460ad
14905459d775f3f56a39ebc2ff081163f7da3529 7606a0d606a74ee5f0761c6e358c2f90405c94ad Aleksey Kulikov <skinny.mind@gmail.com> 1634304003 +0300 checkout: moving from master to their-conflict
7606a0d606a74ee5f0761c6e358c2f90405c94ad 0e409d66f701eea5038fe508ead4c098da699d2c Aleksey Kulikov <skinny.mind@gmail.com> 1634304018 +0300 commit: delete their for conflict
0e409d66f701eea5038fe508ead4c098da699d2c 14905459d775f3f56a39ebc2ff081163f7da3529 Aleksey Kulikov <skinny.mind@gmail.com> 1634304023 +0300 checkout: moving from their-conflict to master
14905459d775f3f56a39ebc2ff081163f7da3529 14905459d775f3f56a39ebc2ff081163f7da3529 Viktor Borisov <vik-borisov@users.noreply.github.com> 1677219441 +0700 reset: moving to HEAD

1
test/assets/merge_repo/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
*.swp