← Back to branch summary

~sergiusens/snappy/go1.5

« back to all changes in this revision

Viewing changes to snappy/click_test.go

  • Committer: Snappy Tarmac
  • Author(s): John R. Lenton
  • Date: 2015-07-30 00:02:41 UTC
  • mfrom: (613.1.5 delayed-service-start)
  • Revision ID: snappy_tarmac-20150730000241-ibvsvnqzxmrf5cqj
This creates wait4network, which waits for network, and makes services that define an external port depend on that. by chipaca approved by sergiusens,ogra

Show diffs side-by-side

added added

removed removed

Lines of Context:
snappy/click_test.go
1231
1231
WantedBy=multi-user.target
1232
1232
`
1233
1233
        expectedServiceAppWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
 
1234
        expectedNetAppWrapper     = fmt.Sprintf(expectedServiceWrapperFmt, "After=ubuntu-snappy.frameworks.target\nRequires=ubuntu-snappy.frameworks.target\nAfter=snappy-wait4network.service\nRequires=snappy-wait4network.service", ".canonical", "canonical", "\n", helpers.UbuntuArchitecture())
1234
1235
        expectedServiceFmkWrapper = fmt.Sprintf(expectedServiceWrapperFmt, "Before=ubuntu-snappy.frameworks.target\nAfter=ubuntu-snappy.frameworks-pre.target\nRequires=ubuntu-snappy.frameworks-pre.target", "", "", "BusName=foo.bar.baz\nType=dbus", helpers.UbuntuArchitecture())
1235
1236
)
1236
1237
 
1253
1254
        c.Assert(generatedWrapper, Equals, expectedServiceAppWrapper)
1254
1255
}
1255
1256
 
 
1257
func (s *SnapTestSuite) TestSnappyGenerateSnapServiceAppWrapperWithExternalPort(c *C) {
 
1258
        service := ServiceYaml{
 
1259
                Name:        "xkcd-webserver",
 
1260
                Start:       "bin/foo start",
 
1261
                Stop:        "bin/foo stop",
 
1262
                PostStop:    "bin/foo post-stop",
 
1263
                StopTimeout: DefaultTimeout,
 
1264
                Description: "A fun webserver",
 
1265
                Ports:       &Ports{External: map[string]Port{"foo": Port{}}},
 
1266
        }
 
1267
        pkgPath := "/apps/xkcd-webserver.canonical/0.3.4/"
 
1268
        aaProfile := "xkcd-webserver.canonical_xkcd-webserver_0.3.4"
 
1269
        m := packageYaml{Name: "xkcd-webserver",
 
1270
                Version: "0.3.4"}
 
1271
 
 
1272
        generatedWrapper, err := generateSnapServicesFile(service, pkgPath, aaProfile, &m)
 
1273
        c.Assert(err, IsNil)
 
1274
        c.Assert(generatedWrapper, Equals, expectedNetAppWrapper)
 
1275
}
 
1276
 
1256
1277
func (s *SnapTestSuite) TestSnappyGenerateSnapServiceFmkWrapper(c *C) {
1257
1278
        service := ServiceYaml{
1258
1279
                Name:        "xkcd-webserver",