Skip to content

Commit 92a5eab

Browse files
committed
Refactor step crypto jwk create commands into using testscript
1 parent 1a494ce commit 92a5eab

31 files changed

Lines changed: 498 additions & 689 deletions

Makefile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,6 @@ race:
157157

158158
.PHONY: test race
159159

160-
integrate: integration
161-
162-
integration: build
163-
$Q $(CGO_OVERRIDE) gotestsum -- -tags=integration ./integration/...
164-
165-
.PHONY: integrate integration
166-
167160
#########################################
168161
# Linting
169162
#########################################
@@ -175,7 +168,7 @@ lint: golint govulncheck
175168

176169
golint: SHELL:=/bin/bash
177170
golint:
178-
$Q LOG_LEVEL=error golangci-lint run --config <(curl -s https://raw.githubusercontent.com/smallstep/workflows/master/.golangci.yml) --build-tags=integration --timeout=30m
171+
$Q LOG_LEVEL=error golangci-lint run --config <(curl -s https://raw.githubusercontent.com/smallstep/workflows/master/.golangci.yml) --timeout=30m
179172

180173
govulncheck:
181174
$Q govulncheck ./...

docs/local-development.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ Run the unit tests:
5252
make test
5353
```
5454

55-
#### Integration Tests
56-
57-
Run the integration tests:
58-
59-
```
60-
make integration
61-
```
62-
6355
#### And coding style tests
6456

6557
The currently enabled linters are defined in our shared [golangci-lint config](https://raw.githubusercontent.com/smallstep/workflows/master/.golangci.yml)

integration/README.md

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package script
1+
package integration
22

33
import (
44
"crypto/rand"
@@ -104,7 +104,7 @@ func TestCertificateVerifyCommand(t *testing.T) {
104104
}
105105

106106
func TestCertificateFingerprintCommand(t *testing.T) {
107-
b, err := os.ReadFile("./../testdata/intermediate_ca.crt")
107+
b, err := os.ReadFile("./testdata/intermediate_ca.crt")
108108
require.NoError(t, err)
109109

110110
testscript.Run(t, testscript.Params{

integration/command.go

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)