Merge pull request #7946 from ipfs/test/fixup-tests

Stebalien · web-flow · commit 4d262b1f7325 · 2021-02-26T15:19:57.000-08:00
fix some sharness-in-CI issues
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -129,7 +129,8 @@ jobs:
         GOPATH: /home/circleci/go
         TEST_VERBOSE: 1
     steps:
-    - run: sudo apt install socat
+    - run: sudo apt update
+    - run: sudo apt install socat net-tools
     - checkout
 
     - run:
diff --git a/test/sharness/t0165-keystore.sh b/test/sharness/t0165-keystore.sh
@@ -175,12 +175,12 @@ ipfs key rm key_ed25519
     test_cmp rsa_key_id roundtrip_rsa_key_id
   '
 
-  test_must_fail "online export rsa key" '
-    ipfs key export generated_rsa_key
+  test_expect_success "online export rsa key" '
+    test_must_fail ipfs key export generated_rsa_key
   '
 
-  test_must_fail "online rotate rsa key" '
-    ipfs key rotate
+  test_expect_success "online rotate rsa key" '
+    test_must_fail ipfs key rotate
   '
   
   test_kill_ipfs_daemon

Original file line number	Diff line number	Diff line change
`@@ -175,12 +175,12 @@ ipfs key rm key_ed25519`
`175`	`175`	`test_cmp rsa_key_id roundtrip_rsa_key_id`
`176`	`176`	`'`
`177`	`177`
`178`		`- test_must_fail "online export rsa key" '`
`179`		`- ipfs key export generated_rsa_key`
	`178`	`+ test_expect_success "online export rsa key" '`
	`179`	`+ test_must_fail ipfs key export generated_rsa_key`
`180`	`180`	`'`
`181`	`181`
`182`		`- test_must_fail "online rotate rsa key" '`
`183`		`- ipfs key rotate`
	`182`	`+ test_expect_success "online rotate rsa key" '`
	`183`	`+ test_must_fail ipfs key rotate`
`184`	`184`	`'`
`185`	`185`
`186`	`186`	`test_kill_ipfs_daemon`