← Back to branch summary

~menno.smits/juju-core/1194481-relation_name_in_status.0

« back to all changes in this revision

Viewing changes to worker/rsyslog/rsyslog_test.go

  • Committer: Tarmac
  • Author(s): Michael Foord
  • Date: 2014-05-13 17:18:30 UTC
  • mfrom: (2670.3.20 ha-rsyslog)
  • Revision ID: tarmac-20140513171830-p3k4f0ecpc895v9q
[r=mfoord] utils:syslog: state servers broadcast logs

https://codereview.appspot.com/93270044/

Show diffs side-by-side

added added

removed removed

Lines of Context:
worker/rsyslog/rsyslog_test.go
7
7
        "io/ioutil"
8
8
        "os"
9
9
        "path/filepath"
 
10
        "strings"
10
11
        stdtesting "testing"
11
12
        "time"
12
13
 
155
156
        c.Assert(err, gc.IsNil)
156
157
 
157
158
        syslogPort := s.Conn.Environ.Config().SyslogPort()
158
 
        syslogConfig := syslog.NewAccumulateConfig(m.Tag(), *rsyslog.LogDir, syslogPort, "")
 
159
        syslogConfig := syslog.NewAccumulateConfig(m.Tag(), *rsyslog.LogDir, syslogPort, "", []string{})
159
160
        syslogConfig.ConfigDir = *rsyslog.RsyslogConfDir
160
161
        rendered, err := syslogConfig.Render()
161
162
        c.Assert(err, gc.IsNil)
 
163
 
162
164
        c.Assert(string(rsyslogConf), gc.DeepEquals, string(rendered))
163
165
}
164
166
 
 
167
func (s *RsyslogSuite) TestAccumulateHA(c *gc.C) {
 
168
        _, m := s.OpenAPIAsNewMachine(c, state.JobManageEnviron)
 
169
        syslogConfig := syslog.NewAccumulateConfig(m.Tag(), *rsyslog.LogDir, 6541, "", []string{"192.168.1", "127.0.0.1"})
 
170
        rendered, err := syslogConfig.Render()
 
171
        c.Assert(err, gc.IsNil)
 
172
 
 
173
        stateServer1Config := ":syslogtag, startswith, \"juju-\" @@192.168.1:6541;LongTagForwardFormat"
 
174
        stateServer2Config := ":syslogtag, startswith, \"juju-\" @@127.0.0.1:6541;LongTagForwardFormat"
 
175
 
 
176
        c.Assert(strings.Contains(string(rendered), stateServer1Config), gc.Equals, true)
 
177
        c.Assert(strings.Contains(string(rendered), stateServer2Config), gc.Equals, true)
 
178
}
 
179
 
165
180
func (s *RsyslogSuite) TestNamespace(c *gc.C) {
166
181
        st, _ := s.OpenAPIAsNewMachine(c, state.JobManageEnviron)
167
182
        // namespace only takes effect in filenames