@@ -19,21 +19,6 @@ import (
19
19
"gotest.tools/skip"
20
20
)
21
21
22
- // TODO: uncomment once we pull on `resolveBundle`
23
- // const (
24
- // singleFileApp = `version: 0.1.0
25
- // name: helloworld
26
- // description: "hello world app"
27
- // namespace: "foo"
28
- // ---
29
- // version: '3.5'
30
- // services:
31
- // hello-world:
32
- // image: hello-world
33
- // ---
34
- // # This section contains the default values for your application parameters.`
35
- // )
36
-
37
22
func TestRenderTemplates (t * testing.T ) {
38
23
skip .If (t , ! hasExperimental , "experimental mode needed for this test" )
39
24
appsPath := filepath .Join ("testdata" , "templates" )
@@ -226,49 +211,6 @@ func TestSplitMerge(t *testing.T) {
226
211
icmd .RunCmd (cmd ).Assert (t , icmd .Success )
227
212
}
228
213
229
- // TODO: uncomment once we pull on `resolveBundle`
230
- //func TestWithRegistry(t *testing.T) {
231
- // r := startRegistry(t)
232
- // defer r.Stop(t)
233
- // registry := r.GetAddress(t)
234
- // // push to a registry
235
- // icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
236
- // icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", "-t", "latest", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
237
- //
238
- // icmd.RunCommand(dockerApp, "inspect", registry+"/myuser/my.dockerapp:0.1.0").Assert(t, icmd.Success)
239
- // // push a single-file app to a registry
240
- // dir := fs.NewDir(t, "save-prepare-build", fs.WithFile("my.dockerapp", singleFileApp))
241
- // defer dir.Remove()
242
- // icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/myuser", dir.Join("my.dockerapp")).Assert(t, icmd.Success)
243
- //
244
- // // push with custom repo name
245
- // icmd.RunCommand(dockerApp, "push", "-t", "marshmallows", "--namespace", registry+"/rainbows", "--repo", "unicorns", "testdata/render/envvariables/my.dockerapp").Assert(t, icmd.Success)
246
- // icmd.RunCommand(dockerApp, "inspect", registry+"/rainbows/unicorns:marshmallows").Assert(t, icmd.Success)
247
- //}
248
- //
249
- //func TestAttachmentsWithRegistry(t *testing.T) {
250
- // r := startRegistry(t)
251
- // defer r.Stop(t)
252
- // registry := r.GetAddress(t)
253
- //
254
- // dir := fs.NewDir(t, "testattachments",
255
- // fs.WithDir("attachments.dockerapp", fs.FromDir("testdata/attachments.dockerapp")),
256
- // )
257
- // defer dir.Remove()
258
- //
259
- // icmd.RunCommand(dockerApp, "push", "--namespace", registry+"/acmecorp", dir.Join("attachments.dockerapp")).Assert(t, icmd.Success)
260
- //
261
- // // inspect will run the core pull code too
262
- // result := icmd.RunCommand(dockerApp, "inspect", registry+"/acmecorp/attachments.dockerapp:0.1.0")
263
- //
264
- // result.Assert(t, icmd.Success)
265
- // resultOutput := result.Combined()
266
- //
267
- // assert.Assert(t, strings.Contains(resultOutput, "config.cfg"))
268
- // assert.Assert(t, strings.Contains(resultOutput, "nesteddir/config2.cfg"))
269
- // assert.Assert(t, strings.Contains(resultOutput, "nesteddir/nested2/nested3/config3.cfg"))
270
- //}
271
-
272
214
func TestBundle (t * testing.T ) {
273
215
tmpDir := fs .NewDir (t , t .Name ())
274
216
defer tmpDir .Remove ()
0 commit comments