← Back to branch summary

~ubuntu-branches/ubuntu/trusty/juju-core/trusty

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/log/syslog/config_test.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-24 16:05:44 UTC
  • mfrom: (1.1.20)
  • Revision ID: package-import@ubuntu.com-20140324160544-g8lsfufby18d5fj4
Tags: 1.17.6-0ubuntu1
https://launchpad.net/bugs/1271144
https://launchpad.net/bugs/1273769
https://launchpad.net/bugs/1248283
https://launchpad.net/bugs/1276909
https://launchpad.net/bugs/1129720
https://launchpad.net/bugs/1240260
* New upstream point release, including fixes for:
  - br0 not bought up by cloud-init with MAAS provider (LP: #1271144).
  - ppc64el enablement for juju/lxc (LP: #1273769).
  - juju userdata should not restart networking (LP: #1248283).
  - error detecting hardware characteristics (LP: #1276909).
  - juju instances not including the default security group (LP: #1129720).
  - juju bootstrap does not honor https_proxy (LP: #1240260).
* d/control,rules: Drop BD on bash-completion, install bash-completion
  direct from upstream source code.
* d/rules: Set HOME prior to generating man pages.
* d/control: Drop alternative dependency on mongodb-server; juju now only
  works on trusty with juju-mongodb.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/log/syslog/config_test.go
10
10
 
11
11
        gc "launchpad.net/gocheck"
12
12
 
 
13
        "launchpad.net/juju-core/agent"
13
14
        "launchpad.net/juju-core/log/syslog"
14
15
        syslogtesting "launchpad.net/juju-core/log/syslog/testing"
15
16
)
42
43
}
43
44
 
44
45
func (s *SyslogConfigSuite) TestAccumulateConfigRender(c *gc.C) {
45
 
        syslogConfigRenderer := syslog.NewAccumulateConfig("some-machine", 8888, "")
 
46
        syslogConfigRenderer := syslog.NewAccumulateConfig("some-machine", agent.DefaultLogDir, 8888, "")
46
47
        s.assertRsyslogConfigContents(
47
 
                c, syslogConfigRenderer, syslogtesting.ExpectedAccumulateSyslogConf(c, "some-machine", "", 8888))
 
48
                c,
 
49
                syslogConfigRenderer,
 
50
                syslogtesting.ExpectedAccumulateSyslogConf(c, "some-machine", "", 8888),
 
51
        )
48
52
}
49
53
 
50
54
func (s *SyslogConfigSuite) TestAccumulateConfigWrite(c *gc.C) {
51
 
        syslogConfigRenderer := syslog.NewAccumulateConfig("some-machine", 8888, "")
 
55
        syslogConfigRenderer := syslog.NewAccumulateConfig("some-machine", agent.DefaultLogDir, 8888, "")
52
56
        syslogConfigRenderer.ConfigDir = s.configDir
53
57
        syslogConfigRenderer.ConfigFileName = "rsyslog.conf"
54
58
        s.assertRsyslogConfigPath(c, syslogConfigRenderer)
56
60
        c.Assert(err, gc.IsNil)
57
61
        syslogConfData, err := ioutil.ReadFile(syslogConfigRenderer.ConfigFilePath())
58
62
        c.Assert(err, gc.IsNil)
59
 
        c.Assert(string(syslogConfData), gc.Equals, syslogtesting.ExpectedAccumulateSyslogConf(c, "some-machine", "", 8888))
 
63
        c.Assert(
 
64
                string(syslogConfData),
 
65
                gc.Equals,
 
66
                syslogtesting.ExpectedAccumulateSyslogConf(c, "some-machine", "", 8888),
 
67
        )
60
68
}
61
69
 
62
70
func (s *SyslogConfigSuite) TestAccumulateConfigRenderWithNamespace(c *gc.C) {
63
 
        syslogConfigRenderer := syslog.NewAccumulateConfig("some-machine", 8888, "namespace")
 
71
        syslogConfigRenderer := syslog.NewAccumulateConfig("some-machine", agent.DefaultLogDir, 8888, "namespace")
64
72
        syslogConfigRenderer.LogDir += "-namespace"
65
73
        s.assertRsyslogConfigContents(
66
 
                c, syslogConfigRenderer, syslogtesting.ExpectedAccumulateSyslogConf(c, "some-machine", "namespace", 8888))
 
74
                c, syslogConfigRenderer, syslogtesting.ExpectedAccumulateSyslogConf(
 
75
                        c, "some-machine", "namespace", 8888,
 
76
                ),
 
77
        )
67
78
}
68
79
 
69
80
func (s *SyslogConfigSuite) TestForwardConfigRender(c *gc.C) {
70
 
        syslogConfigRenderer := syslog.NewForwardConfig("some-machine", 999, "", []string{"server"})
 
81
        syslogConfigRenderer := syslog.NewForwardConfig(
 
82
                "some-machine", agent.DefaultLogDir, 999, "", []string{"server"},
 
83
        )
71
84
        s.assertRsyslogConfigContents(
72
 
                c, syslogConfigRenderer, syslogtesting.ExpectedForwardSyslogConf(c, "some-machine", "", "server", 999))
 
85
                c, syslogConfigRenderer, syslogtesting.ExpectedForwardSyslogConf(
 
86
                        c, "some-machine", agent.DefaultLogDir, "", "server", 999,
 
87
                ),
 
88
        )
73
89
}
74
90
 
75
91
func (s *SyslogConfigSuite) TestForwardConfigRenderWithNamespace(c *gc.C) {
76
 
        syslogConfigRenderer := syslog.NewForwardConfig("some-machine", 999, "namespace", []string{"server"})
 
92
        syslogConfigRenderer := syslog.NewForwardConfig(
 
93
                "some-machine", agent.DefaultLogDir, 999, "namespace", []string{"server"},
 
94
        )
77
95
        s.assertRsyslogConfigContents(
78
 
                c, syslogConfigRenderer, syslogtesting.ExpectedForwardSyslogConf(c, "some-machine", "namespace", "server", 999))
 
96
                c, syslogConfigRenderer, syslogtesting.ExpectedForwardSyslogConf(
 
97
                        c, "some-machine", agent.DefaultLogDir, "namespace", "server", 999,
 
98
                ),
 
99
        )
79
100
}
80
101
 
81
102
func (s *SyslogConfigSuite) TestForwardConfigWrite(c *gc.C) {
82
 
        syslogConfigRenderer := syslog.NewForwardConfig("some-machine", 999, "", []string{"server"})
 
103
        syslogConfigRenderer := syslog.NewForwardConfig(
 
104
                "some-machine", agent.DefaultLogDir, 999, "", []string{"server"},
 
105
        )
83
106
        syslogConfigRenderer.ConfigDir = s.configDir
84
107
        syslogConfigRenderer.ConfigFileName = "rsyslog.conf"
85
108
        s.assertRsyslogConfigPath(c, syslogConfigRenderer)
88
111
        syslogConfData, err := ioutil.ReadFile(syslogConfigRenderer.ConfigFilePath())
89
112
        c.Assert(err, gc.IsNil)
90
113
        c.Assert(
91
 
                string(syslogConfData), gc.Equals, syslogtesting.ExpectedForwardSyslogConf(c, "some-machine", "", "server", 999))
 
114
                string(syslogConfData),
 
115
                gc.Equals,
 
116
                syslogtesting.ExpectedForwardSyslogConf(
 
117
                        c, "some-machine", agent.DefaultLogDir, "", "server", 999,
 
118
                ),
 
119
        )
92
120
}