Skip to content

Commit 10029d7

Browse files
committed
refactor(tests): rewrite basic vagrant integration test in Go
1 parent 7ee5d36 commit 10029d7

133 files changed

Lines changed: 194 additions & 129 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,19 @@ status: check-fleet
118118
stop: check-fleet
119119
$(FLEETCTL) stop -block-attempts=600 $(strip $(call deis_units,launched,active))
120120

121-
test: .PHONY
121+
test: test-components test-integration
122+
123+
test-components:
122124
@$(foreach C,$(ALL_COMPONENTS), \
123125
echo \\nTesting deis/$(C) ; \
124126
$(MAKE) -C $(C) test ; \
125127
)
126128

127-
tests:
128-
cd test && bundle install && bundle exec rake
129+
test-integration:
130+
$(MAKE) -C tests/ test
129131

130132
uninstall: check-fleet stop
131-
$(FLEETCTL) unload $(call deis_units,launched,.)
133+
$(FLEETCTL) unload -block-attempts=600 $(call deis_units,launched,.)
132134
$(FLEETCTL) destroy $(strip $(call deis_units,.,.))
133135

134136
.PHONY:

registry/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# test-unit temporary files
2-
test-unit/
2+
test-unit.tmp/

registry/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ test-unit:
4141
../venv/bin/python -m unittest discover -s test
4242

4343
test-functional:
44-
GOPATH=$(CURDIR)/../test/_vendor:$(GOPATH) go test -v ./test/...
44+
GOPATH=$(CURDIR)/../tests/_vendor:$(GOPATH) go test -v ./test/...

test/Gemfile

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

test/Gemfile.lock

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

test/Rakefile

Lines changed: 0 additions & 88 deletions
This file was deleted.
File renamed without changes.

tests/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
test:
2+
go test -tags integration -timeout 30m -v ./...

test/README.md renamed to tests/README.md

Lines changed: 6 additions & 16 deletions
File renamed without changes.

0 commit comments

Comments
 (0)