Merge lp:~chipaca/snappy/service into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Services command, iteration 1.

For next iteration: apparmor & seccomp output in status.

[Michael Vogt (mvo)]

Nice work! Thanks for this.

One nit I noticed while doing a quick test on a fresh snappy system:
"""
$ sudo ./snappy service status
snappy service not found
"""

Some more comments inline but nothing important, this is fine to land once the above is a bit more user friendly.

[Michael Vogt (mvo)]

Yay!

review: Approve

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snappy failed due to conflicts:

text conflict in po/snappy.pot

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~chipaca/snappy/service into lp:snappy failed. Below is the output from the failed tests.

Checking docs
Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/gosexy/gettext failed; trying to fetch newer version
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update github.com/blakesmith/ar failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/jessevdk/go-flags failed; trying to fetch newer version
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 15347ef417a300349807983f15af9e65cd2e1b3a
update golang.org/x/crypto failed; trying to fetch newer version
github.com/mvo5/uboot-go now at 361f6ebcbb54f389d15dc9faefa000e996ba3e37
update gopkg.in/check.v1 failed; trying to fetch newer version
golang.org/x/crypto now at 60052bd85f2d91293457e8811b0cf26b773de469
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
Building

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/snappy
cp -a . $GOPATH/src/launchpad.net/snappy/
cd $GOPATH/src/launchpad.net/snappy

./run-checks
./run-checks: 2: ./run-checks: 1: not found
./run-checks: 2: ./run-checks: 3803: not found
./run-checks: 2: ./run-checks: 0c: not found

if which goctest >/dev/null; then
    goctest="goctest"
else
    goctest="go test"
fi

echo Checking docs
./mdlint.py docs/*.md

echo Checking formatting
fmt=$(gofmt -l .)

if [ -n "$fmt" ]; then
    echo "Formatting wrong in following files"
    echo "$fmt"
    exit 1
fi

echo Installing godeps
go get launchpad.net/godeps
export PATH=$PATH:$GOPATH/bin

echo Install golint
go get github.com/golang/lint/golint
export PATH=$PATH:$GOPATH/bin

echo Obtaining dependencies
godeps -u dependencies.tsv

echo Building
go build -v launchpad.net/snappy/...
github.com/blakesmith/ar
launchpad.net/snappy/logger
github.com/jessevdk/go-flags
launchpad.net/snappy/helpers
golang.org/x/crypto/ssh/terminal
github.com/gosexy/gettext
launchpad.net/snappy/clickdeb
launchpad.net/snappy/pkg
launchpad.net/snappy/priv
github.com/cheggaaa/pb
launchpad.net/snappy/progress
launchpad.net/snappy/i18n
github.com/mvo5/goconfigparser
gopkg.in/yaml.v2
launchpad.net/snappy/oauth
github.com/mvo5/uboot-go/uenv
launchpad.net/snappy/policy
launchpad.net/snappy/release
launchpad.net/snappy/systemd
launchpad.net/snappy/i18n/xgettext-go
launchpad.net/snappy/coreconfig
launchpad.net/snappy/partition
launchpad.net/snappy/provisioning
launchpad.net/snappy/snappy
launchpad.net/snappy/cmd/snappy
# launchpad.net/snappy/c...

[John Lenton (chipaca)]

I must have a brown paper bag around here somewhere...

[lp:~chipaca/snappy/service]

602. By John Lenton on 2015-07-24

this is the brown paper back edit

[Sergio Schvezov (sergiusens)]

\o/

review: Approve

=== added file 'cmd/snappy/cmd_service.go'
--- cmd/snappy/cmd_service.go	1970-01-01 00:00:00 +0000
+++ cmd/snappy/cmd_service.go	2015-07-24 15:24:16 +0000
@@ -0,0 +1,139 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"text/tabwriter"
+
+	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/i18n"
+	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/progress"
+	"launchpad.net/snappy/snappy"
+)
+
+type cmdService struct {
+	Status  svcStatus  `command:"status"`
+	Start   svcStart   `command:"start"`
+	Stop    svcStop    `command:"stop"`
+	Restart svcRestart `command:"restart"`
+}
+type svcBase struct {
+	Args struct {
+		Snap    string `positional-arg-name:"snap"`
+		Service string `positional-arg-name:"service"`
+	} `positional-args:"yes"`
+}
+type svcStatus struct{ svcBase }
+type svcStart struct{ svcBase }
+type svcStop struct{ svcBase }
+type svcRestart struct{ svcBase }
+
+func init() {
+	_, err := parser.AddCommand("service",
+		i18n.G("Query and modify snappy services"),
+		i18n.G("Query and modify snappy services of locally-installed packages"),
+		&cmdService{})
+
+	if err != nil {
+		logger.Panicf("Unable to service: %v", err)
+	}
+
+}
+
+const (
+	doStatus = iota
+	doStart
+	doStop
+	doRestart
+)
+
+func (s *svcBase) doExecute(cmd int) ([]string, error) {
+	actor, err := snappy.FindServices(s.Args.Snap, s.Args.Service, progress.MakeProgressBar())
+	if err != nil {
+		return nil, err
+	}
+
+	switch cmd {
+	case doStatus:
+		return actor.Status()
+	case doStart:
+		return nil, actor.Start()
+	case doStop:
+		return nil, actor.Stop()
+	case doRestart:
+		return nil, actor.Restart()
+	default:
+		panic("can't happen")
+	}
+}
+
+func (s *svcStatus) Execute(args []string) error {
+	stati, err := s.doExecute(doStatus)
+	if err != nil {
+		return err
+	}
+
+	w := tabwriter.NewWriter(os.Stdout, 0, 8, 1, '\t', 0)
+
+	ws, _ := helpers.GetTermWinsize()
+	rows := int(ws.Row) - 2
+
+	header := i18n.G("Snap\tService\tState")
+
+	for i, status := range stati {
+		// print a header every $rows rows if rows is bigger
+		// than 10; otherwise, just the once. 10 is arbitrary,
+		// but the thinking is that on the one hand you don't
+		// want to be using up too much space with headers on
+		// really small terminals and on the other rows might
+		// actually be negative if you're not on a tty.
+		if i%rows == 0 && (i == 0 || rows > 10) {
+			fmt.Fprintln(w, header)
+		}
+		fmt.Fprintln(w, status)
+	}
+	w.Flush()
+
+	return err
+}
+
+func (s *svcStart) Execute(args []string) error {
+	return withMutex(func() error {
+		_, err := s.doExecute(doStart)
+		return err
+	})
+}
+
+func (s *svcStop) Execute(args []string) error {
+	return withMutex(func() error {
+		_, err := s.doExecute(doStop)
+		return err
+	})
+}
+
+func (s *svcRestart) Execute(args []string) error {
+	return withMutex(func() error {
+		_, err := s.doExecute(doRestart)
+		return err
+	})
+}

=== added file 'helpers/winsize.go'
--- helpers/winsize.go	1970-01-01 00:00:00 +0000
+++ helpers/winsize.go	2015-07-24 15:24:16 +0000
@@ -0,0 +1,48 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package helpers
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// Winsize is from tty_ioctl(4)
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	xpixel uint16 // unused
+	Ypixel uint16 // unused
+}
+
+// GetTermWinsize performs the TIOCGWINSZ ioctl on stdout
+func GetTermWinsize() (*Winsize, error) {
+	ws := &Winsize{}
+	x, _, errno := syscall.Syscall(syscall.SYS_IOCTL, uintptr(syscall.Stdout), uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(ws)))
+
+	if int(x) == -1 {
+		// returning ws on error lets people that don't care
+		// about the error get on with querying the struct
+		// (which will be empty on error).
+		return ws, errno
+	}
+
+	return ws, nil
+}

=== modified file 'po/snappy.pot'
--- po/snappy.pot	2015-07-24 12:08:00 +0000
+++ po/snappy.pot	2015-07-24 15:24:16 +0000
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: snappy\n"
         "Report-Msgid-Bugs-To: [e-mail]\n"
-        "POT-Creation-Date: 2015-07-24 14:07+0200\n"
+        "POT-Creation-Date: 2015-07-24 16:16+0100\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -155,6 +155,12 @@
 msgid   "Purging %s\n"
 msgstr  ""
 
+msgid   "Query and modify snappy services"
+msgstr  ""
+
+msgid   "Query and modify snappy services of locally-installed packages"
+msgstr  ""
+
 msgid   "Query the store for available packages"
 msgstr  ""
 
@@ -226,6 +232,9 @@
 msgid   "Show channel information and expand all fields"
 msgstr  ""
 
+msgid   "Snap\tService\tState"
+msgstr  ""
+
 msgid   "Specify an alternate output directory for the resulting package"
 msgstr  ""
 
@@ -324,6 +333,16 @@
 msgid   "snappy autopilot triggered a reboot to boot into an up to date system -- temprorarily disable the reboot by running 'sudo shutdown -c'"
 msgstr  ""
 
+#. TRANSLATORS: the first %s is the package name, the second is the service name; the %v is the error
+#, c-format
+msgid   "unable to start %s's service %s: %v"
+msgstr  ""
+
+#. TRANSLATORS: the first %s is the package name, the second is the service name; the %v is the error
+#, c-format
+msgid   "unable to stop %s's service %s: %v"
+msgstr  ""
+
 #. TRANSLATORS: the %s is a date
 #, c-format
 msgid   "updated: %s\n"

=== modified file 'snappy/errors.go'
--- snappy/errors.go	2015-06-30 12:30:02 +0000
+++ snappy/errors.go	2015-07-24 15:24:16 +0000
@@ -32,6 +32,9 @@
 	// ErrPackageNotFound is returned when a snap can not be found
 	ErrPackageNotFound = errors.New("snappy package not found")
 
+	// ErrServiceNotFound is returned when a service can not be found
+	ErrServiceNotFound = errors.New("snappy service not found")
+
 	// ErrNeedRoot is returned when a command needs root privs but
 	// the caller is not root
 	ErrNeedRoot = errors.New("this command requires root access. Please re-run using 'sudo'")

=== added file 'snappy/service.go'
--- snappy/service.go	1970-01-01 00:00:00 +0000
+++ snappy/service.go	2015-07-24 15:24:16 +0000
@@ -0,0 +1,150 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package snappy
+
+import (
+	"fmt"
+	"path/filepath"
+	"time"
+
+	"launchpad.net/snappy/i18n"
+	"launchpad.net/snappy/progress"
+	"launchpad.net/snappy/systemd"
+)
+
+type svcT struct {
+	m   *packageYaml
+	svc *ServiceYaml
+}
+
+// A ServiceActor collects the services found by FindServices and lets
+// you perform differnt actions (start, stop, etc) on them.
+type ServiceActor struct {
+	svcs []*svcT
+	pb   progress.Meter
+	sysd systemd.Systemd
+}
+
+// FindServices finds all matching services (empty string matches all)
+// and lets you perform different actions (start, stop, etc) on them.
+//
+// If a snap is specified and no matching snaps are found,
+// ErrPackageNotFound is returned. If a snap is specified and the
+// matching snaps has no matching services, ErrServiceNotFound is
+// returned.
+//
+// If no snap is specified, an empty result is not an error.
+func FindServices(snapName string, serviceName string, pb progress.Meter) (*ServiceActor, error) {
+	var svcs []*svcT
+
+	repo := NewMetaLocalRepository()
+	installed, _ := repo.Installed()
+
+	foundSnap := false
+	for _, part := range installed {
+		snap, ok := part.(*SnapPart)
+		if !ok {
+			// can't happen
+			continue
+		}
+		if snapName != "" && snapName != snap.Name() {
+			continue
+		}
+		foundSnap = true
+
+		yamls := snap.ServiceYamls()
+		for i := range yamls {
+			if serviceName != "" && serviceName != yamls[i].Name {
+				continue
+			}
+			s := &svcT{
+				m:   snap.m,
+				svc: &yamls[i],
+			}
+			svcs = append(svcs, s)
+		}
+	}
+	if snapName != "" {
+		if !foundSnap {
+			return nil, ErrPackageNotFound
+		}
+		if len(svcs) == 0 {
+			return nil, ErrServiceNotFound
+		}
+	}
+
+	return &ServiceActor{
+		svcs: svcs,
+		pb:   pb,
+		sysd: systemd.New(globalRootDir, pb),
+	}, nil
+}
+
+// Status of all the found services.
+func (actor *ServiceActor) Status() ([]string, error) {
+	var stati []string
+	for _, svc := range actor.svcs {
+		svcname := filepath.Base(generateServiceFileName(svc.m, *svc.svc))
+		status, err := actor.sysd.Status(svcname)
+		if err != nil {
+			return nil, err
+		}
+		status = fmt.Sprintf("%s\t%s\t%s", svc.m.Name, svc.svc.Name, status)
+		stati = append(stati, status)
+	}
+
+	return stati, nil
+}
+
+// Start all the found services.
+func (actor *ServiceActor) Start() error {
+	for _, svc := range actor.svcs {
+		svcname := filepath.Base(generateServiceFileName(svc.m, *svc.svc))
+		if err := actor.sysd.Start(svcname); err != nil {
+			// TRANSLATORS: the first %s is the package name, the second is the service name; the %v is the error
+			return fmt.Errorf(i18n.G("unable to start %s's service %s: %v"), svc.m.Name, svc.svc.Name, err)
+		}
+	}
+
+	return nil
+}
+
+// Stop all the found services.
+func (actor *ServiceActor) Stop() error {
+	for _, svc := range actor.svcs {
+		svcname := filepath.Base(generateServiceFileName(svc.m, *svc.svc))
+		if err := actor.sysd.Stop(svcname, time.Duration(svc.svc.StopTimeout)); err != nil {
+			// TRANSLATORS: the first %s is the package name, the second is the service name; the %v is the error
+			return fmt.Errorf(i18n.G("unable to stop %s's service %s: %v"), svc.m.Name, svc.svc.Name, err)
+		}
+	}
+
+	return nil
+}
+
+// Restart all the found services.
+func (actor *ServiceActor) Restart() error {
+	err := actor.Stop()
+	if err != nil {
+		return err
+	}
+
+	return actor.Start()
+}

=== added file 'snappy/service_test.go'
--- snappy/service_test.go	1970-01-01 00:00:00 +0000
+++ snappy/service_test.go	2015-07-24 15:24:16 +0000
@@ -0,0 +1,142 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package snappy
+
+import (
+	"errors"
+
+	. "gopkg.in/check.v1"
+
+	"launchpad.net/snappy/progress"
+	"launchpad.net/snappy/systemd"
+)
+
+type ServiceActorSuite struct {
+	i      int
+	argses [][]string
+	outs   [][]byte
+	errors []error
+	pb     progress.Meter
+}
+
+var _ = Suite(&ServiceActorSuite{})
+
+// borrowed from systemd_test
+func (s *ServiceActorSuite) myRun(args ...string) (out []byte, err error) {
+	s.argses = append(s.argses, args)
+	if s.i < len(s.outs) {
+		out = s.outs[s.i]
+	}
+	if s.i < len(s.errors) {
+		err = s.errors[s.i]
+	}
+	s.i++
+	return out, err
+}
+
+func (s *ServiceActorSuite) SetUpTest(c *C) {
+	SetRootDir(c.MkDir())
+	systemd.SystemctlCmd = s.myRun
+	makeInstalledMockSnap(globalRootDir, "")
+	s.i = 0
+	s.argses = nil
+	s.errors = nil
+	s.outs = nil
+	s.pb = &MockProgressMeter{}
+}
+
+func (s *ServiceActorSuite) TestFindServicesNoPackages(c *C) {
+	_, err := FindServices("notfound", "", s.pb)
+	c.Check(err, Equals, ErrPackageNotFound)
+}
+
+func (s *ServiceActorSuite) TestFindServicesNoPackagesNoPattern(c *C) {
+	// tricky way of hiding the installed package ;)
+	SetRootDir(c.MkDir())
+	actor, err := FindServices("", "", s.pb)
+	c.Check(err, IsNil)
+	c.Assert(actor, NotNil)
+	c.Check(actor.svcs, HasLen, 0)
+}
+
+func (s *ServiceActorSuite) TestFindServicesNoServices(c *C) {
+	_, err := FindServices("hello-app", "notfound", s.pb)
+	c.Check(err, Equals, ErrServiceNotFound)
+}
+
+func (s *ServiceActorSuite) TestFindServicesFindsServices(c *C) {
+	actor, err := FindServices("", "", s.pb)
+	c.Assert(err, IsNil)
+	c.Assert(actor, NotNil)
+	c.Check(actor.svcs, HasLen, 1)
+
+	s.outs = [][]byte{
+		nil, // for the "stop"
+		[]byte("ActiveState=inactive\n"),
+		nil, // for the "start"
+		nil, // for the "stop"
+		[]byte("ActiveState=inactive\n"),
+		nil, // for the "start"
+		[]byte("Id=x\nLoadState=loaded\nActiveState=active\nSubState=running\n"), // status
+	}
+	s.errors = []error{
+		nil, nil, // stop & check
+		nil,           // start
+		nil, nil, nil, // restart (== stop & start)
+		nil,                // status
+		&systemd.Timeout{}, // flag
+	}
+
+	c.Check(actor.Stop(), IsNil)
+	c.Check(actor.Start(), IsNil)
+	c.Check(actor.Restart(), IsNil)
+	status, err := actor.Status()
+	c.Check(err, IsNil)
+	c.Assert(status, HasLen, 1)
+	c.Check(status[0], Equals, "hello-app\tsvc1\tloaded; active (running)")
+}
+
+func (s *ServiceActorSuite) TestFindServicesReportsErrors(c *C) {
+	actor, err := FindServices("", "", s.pb)
+	c.Assert(err, IsNil)
+	c.Assert(actor, NotNil)
+	c.Check(actor.svcs, HasLen, 1)
+
+	anError := errors.New("error")
+
+	s.outs = [][]byte{
+		nil,
+		nil,
+		nil,
+		nil,
+	}
+	s.errors = []error{
+		anError, // stop
+		anError, // start
+		anError, // restart
+		anError, // status
+	}
+
+	c.Check(actor.Stop(), NotNil)
+	c.Check(actor.Start(), NotNil)
+	c.Check(actor.Restart(), NotNil)
+	_, err = actor.Status()
+	c.Check(err, NotNil)
+}

=== modified file 'systemd/systemd.go'
--- systemd/systemd.go	2015-06-05 18:29:52 +0000
+++ systemd/systemd.go	2015-07-24 15:24:16 +0000
@@ -68,6 +68,7 @@
 	Kill(service, signal string) error
 	Restart(service string, timeout time.Duration) error
 	GenServiceFile(desc *ServiceDescription) string
+	Status(service string) (string, error)
 }
 
 // ServiceDescription describes a snappy systemd service
@@ -140,6 +141,34 @@
 	return err
 }
 
+var statusregex = regexp.MustCompile(`(?m)^(?:(.*?)=(.*))?$`)
+
+func (s *systemd) Status(serviceName string) (string, error) {
+	bs, err := SystemctlCmd("show", "--property=Id,LoadState,ActiveState,SubState", serviceName)
+	if err != nil {
+		return "", err
+	}
+
+	load, active, sub := "", "", ""
+
+	for _, bs := range statusregex.FindAllSubmatch(bs, -1) {
+		if len(bs[0]) > 0 {
+			k := string(bs[1])
+			v := string(bs[2])
+			switch k {
+			case "LoadState":
+				load = v
+			case "ActiveState":
+				active = v
+			case "SubState":
+				sub = v
+			}
+		}
+	}
+
+	return fmt.Sprintf("%s; %s (%s)", load, active, sub), nil
+}
+
 // Stop the given service, and wait until it has stopped.
 func (s *systemd) Stop(serviceName string, timeout time.Duration) error {
 	if _, err := SystemctlCmd("stop", serviceName); err != nil {

=== modified file 'systemd/systemd_test.go'
--- systemd/systemd_test.go	2015-06-05 18:29:52 +0000
+++ systemd/systemd_test.go	2015-07-24 15:24:16 +0000
@@ -111,6 +111,16 @@
 	c.Check(s.argses[1], DeepEquals, s.argses[3])
 }
 
+func (s *SystemdTestSuite) TestStatus(c *C) {
+	s.outs = [][]byte{
+		[]byte("Id=Thing\nLoadState=LoadState\nActiveState=ActiveState\nSubState=SubState\n"),
+	}
+	s.errors = []error{nil}
+	out, err := New("", s.rep).Status("foo")
+	c.Assert(err, IsNil)
+	c.Check(out, Equals, "LoadState; ActiveState (SubState)")
+}
+
 func (s *SystemdTestSuite) TestStopTimeout(c *C) {
 	oldSteps := stopSteps
 	oldDelay := stopDelay