engine: docker compose logs test #866
Conversation
| ) | ||
|
|
||
| const pod1 = k8s.PodID("pod1") | ||
|
|
||
| var image1 = container.MustParseNamedTagged("re.po/project/myapp:tilt-936a185caaa266bb") | ||
|
|
||
| const digest1 = "sha256:936a185caaa266bb9cbe981e9e05cb78cd732b0b3280eb944412bb6f8f8f07af" | ||
|
|
||
| type containerBaDFixture struct { |
There was a problem hiding this comment.
this is unused afaict
There was a problem hiding this comment.
¯_(ツ)_/¯ cool! then yes delete it!
| @@ -96,6 +104,9 @@ func (b *fakeBuildAndDeployer) BuildAndDeploy(ctx context.Context, manifest mode | |||
| return store.BuildResult{}, err | |||
| } | |||
|
|
|||
| if manifest.IsDockerCompose() { | |||
| return b.nextBuildResult(imageID), nil | |||
There was a problem hiding this comment.
This is kind of hacky. Any better ideas?
There was a problem hiding this comment.
yeahhh kind of hacky. fine for now tho -- except that docker compose builds don't return any info in the BuildResult (cuz there's not an image id) -- so maybe change b.nextBuildResult to work okay given a nil imageID.
| ) | ||
|
|
||
| const pod1 = k8s.PodID("pod1") | ||
|
|
||
| var image1 = container.MustParseNamedTagged("re.po/project/myapp:tilt-936a185caaa266bb") | ||
|
|
||
| const digest1 = "sha256:936a185caaa266bb9cbe981e9e05cb78cd732b0b3280eb944412bb6f8f8f07af" | ||
|
|
||
| type containerBaDFixture struct { |
There was a problem hiding this comment.
¯_(ツ)_/¯ cool! then yes delete it!
internal/engine/upper_test.go
Outdated
| @@ -2030,6 +2069,31 @@ func (f *testFixture) WriteConfigFiles(args ...string) { | |||
| f.store.Dispatch(manifestFilesChangedAction{manifestName: ConfigsManifestName, files: filenames}) | |||
| } | |||
|
|
|||
| func (f *testFixture) setupHAProxy() model.Manifest { | |||
There was a problem hiding this comment.
consider renaming this method to be obvious that we're setting up "some docker-compose test junk" instead of like, an actual proxy doing actual things.
also, instead of tracking origWD and reading then writing files, you could just store the file contents strings -- see testyaml.go
There was a problem hiding this comment.
I have had a TON of problems with indentations when storing YAML that way so I am trying to sidestep it for now
| func TestDockerComposeRecordsLogs(t *testing.T) { | ||
| f := newTestFixture(t) | ||
| m := f.setupHAProxy() | ||
| expected := "spoonerisms_1 | 2018-12-20T16:11:04.070480042Z yarn install v1.10." |
There was a problem hiding this comment.
also wait i'm confused, is this actually running docker-compose up??!
There was a problem hiding this comment.
nvm i see! if you wanna be extra clear, make this bit its own paragraph with comment (like "call to docker-compose logs will return this line -- make sure log watcher picks it up")
also -- test that it ends up in manifest...logs? (Or todo for that test.)
| @@ -96,6 +104,9 @@ func (b *fakeBuildAndDeployer) BuildAndDeploy(ctx context.Context, manifest mode | |||
| return store.BuildResult{}, err | |||
| } | |||
|
|
|||
| if manifest.IsDockerCompose() { | |||
| return b.nextBuildResult(imageID), nil | |||
There was a problem hiding this comment.
yeahhh kind of hacky. fine for now tho -- except that docker compose builds don't return any info in the BuildResult (cuz there's not an image id) -- so maybe change b.nextBuildResult to work okay given a nil imageID.
No description provided.