Initial gingko implementation #261
Conversation
baude
changed the title
baude
force-pushed
the
ginkgo
branch
5 times, most recently
from
1424d2c to
551587f
Compare
|
💥 Invalid
|
|
💥 Invalid
|
|
💥 Invalid
|
baude
force-pushed
the
ginkgo
branch
7 times, most recently
from
67fcfaf to
ba6d7cc
Compare
test/e2e/libpod_suite_test.go
Outdated
| }() | ||
| options := ©.Options{} | ||
|
|
||
| importRef, err := alltransports.ParseImageName(fmt.Sprintf("docker://%s", imageName)) |
There was a problem hiding this comment.
Combined with line 167, I think this ends up prepending "docker://" to image twice?
test/e2e/libpod_suite_test.go
Outdated
| } | ||
|
|
||
| exportTo := filepath.Join(p.ArtifactPath, "image") | ||
| exportRef, err := alltransports.ParseImageName(exportTo) |
There was a problem hiding this comment.
You'll need to prepend "dir:" to exportTo here.
test/e2e/libpod_suite_test.go
Outdated
| return errors.Errorf("error parsing image name: %v", err) | ||
| } | ||
|
|
||
| importFrom := fmt.Sprintf("dir://%s", filepath.Join(p.ArtifactPath), "image") |
There was a problem hiding this comment.
This should be "dir:", not "dir://". Only the "docker" transport expects a "//".
There was a problem hiding this comment.
The argument list for that filepath.Join() call doesn't include image the way the one on line 189 does?
test/e2e/libpod_suite_test.go
Outdated
| os.Exit(1) | ||
| } | ||
|
|
||
| names := append(destImage.Names, image, image) |
There was a problem hiding this comment.
No point in appending image twice here, since SetNames deduplicates them anyway.
test/e2e/libpod_suite_test.go
Outdated
| err = copy.Image(policyContext, ref, importRef, options) | ||
| if err != nil { | ||
| logrus.Errorf("error importing %s: %v", importFrom, err) | ||
| os.Exit(1) |
There was a problem hiding this comment.
This bypasses any deferred functions, in case doing so could create problems elsewhere.
test/e2e/libpod_suite_test.go
Outdated
| destImage, err1 := storage.Transport.GetStoreImage(store, ref) | ||
| if err1 != nil { | ||
| logrus.Errorf("error finding image: %v", err1) | ||
| os.Exit(1) |
There was a problem hiding this comment.
This bypasses any deferred functions, in case doing so could create problems elsewhere.
baude
force-pushed
the
ginkgo
branch
3 times, most recently
from
1d8bf34 to
24bd688
Compare
baude
changed the title
|
@rhatdan , @mheon , @umohnani8, @TomSweeneyRedHat PTAL |
Makefile
Outdated
| localintegration: test-binaries | ||
| bash -i ./test/test_runner.sh ${TESTFLAGS} | ||
| ginkgo -v test/e2e/. |
There was a problem hiding this comment.
Don't we need test_runner.sh at least for a little while longer?
There was a problem hiding this comment.
as i said in the commit message, i disabled the bats tests in ubuntu as we are running them in fedora and centos.
There was a problem hiding this comment.
I don't think we should do that. I want the full tests to run on all platforms so we catch distro problems.
There was a problem hiding this comment.
I'm OK with it if the intent is the eventual removal of BATS tests as they are replaced by Ginkgo tests.
There was a problem hiding this comment.
Yes, that is the point ... I removed it in part because the travis tests are so darned long and i wanted to take some burden off the ci. i can re-enable them but given all the ci issues we have had of late, i think it will will contributory to frustration.
There was a problem hiding this comment.
added back in per request ...
baude
force-pushed
the
ginkgo
branch
19 times, most recently
from
4b3efbf to
b4167a6
Compare
|
bot, retest this please |
This implements the ginkgo integration test framework for podman. As tests are migrated from bats to ginkgo, we will still run both integration suites. When a test is migrated, we remove the tests from bats at that time. All new tests should be just for the ginkgo framework. One exception is that we only run the ginkgo suit in the travis/ubuntu environment. The CentOS and Fedora PAPR nodes will more than cover those. Signed-off-by: baude <[email protected]>
|
I'm going to merge this to get the show on the road. |
|
📌 Commit f29f526 has been approved by |
|
⚡ Test exempted: merge already tested. |
github-actions
bot
added
the
locked - please file new issue/PR
Signed-off-by: baude [email protected]