~dpb/landscape-client/test-release-12.04.02

« back to all changes in this revision

Viewing changes to landscape/tests/test_watchdog.py

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Hasenack
  • Date: 2011-03-01 15:38:11 UTC
  • mfrom: (1.1.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20110301153811-ow0pu4j068a9ysgo
Tags: 11.02-0ubuntu0.11.04.0
* New upstream version (LP: #727324)

  - Exit gracefully instead of crashing when the filesystem is
    read-only (LP: #649997).

  - Drop hal requirement (LP: #708502).

  - Enable HTTP compression in Curl (LP: #297623).

  - Explicitly name log files that need to be rotated (LP: #634236).

  - Assorted test suite fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
1315
1315
        getpwnam("landscape").pw_uid
1316
1316
        self.mocker.result(1001)
1317
1317
        self.mocker.replay()
1318
 
        sys_exit = self.assertRaises(SystemExit, run)
 
1318
        sys_exit = self.assertRaises(SystemExit, run, ["landscape-client"])
1319
1319
        self.assertIn("landscape-client can only be run"
1320
1320
                      " as 'root' or 'landscape'.", str(sys_exit))
1321
1321
 
1340
1340
        getpwnam("landscape")
1341
1341
        self.mocker.throw(KeyError())
1342
1342
        self.mocker.replay()
1343
 
        sys_exit = self.assertRaises(SystemExit, run)
 
1343
        sys_exit = self.assertRaises(SystemExit, run, ["landscape-client"])
1344
1344
        self.assertIn("The 'landscape' user doesn't exist!", str(sys_exit))
1345
1345
 
1346
1346
    def test_clean_environment(self):