← Back to branch summary

~andreserl/maas/make_daily_default

« back to all changes in this revision

Viewing changes to src/provisioningserver/pserv_services/tests/test_service_monitor_service.py

[r=ltrager][bug=][author=blake-rouse] Refactor the ServiceMonitor to make it all twisted based and allow it to be used both by the regiond and rackd. The branch also removes anything related to upstart for monitoring or controlling services.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/pserv_services/tests/test_service_monitor_service.py
29
29
        service = sms.ServiceMonitorService()
30
30
        self.assertThat(service, MatchesStructure.byEquality(
31
31
            call=(service.monitor_services, (), {}),
32
 
            step=(2 * 60), clock=None))
 
32
            step=(60), clock=None))
33
33
 
34
34
    def make_monitor_service(self):
35
35
        service = sms.ServiceMonitorService(Clock())
46
46
        self.assertThat(mock_deferToThread, MockNotCalled())
47
47
        self.assertDocTestMatches(
48
48
            "Skipping check of services; they're not running under the "
49
 
            "supervision of Upstart or systemd.", logger.output)
 
49
            "supervision of systemd.", logger.output)
50
50
 
51
 
    def test_monitor_services_defers_ensure_all_services_to_thread(self):
 
51
    def test_monitor_services_calls_ensureServices(self):
52
52
        # Pretend we're in a production environment.
53
53
        self.patch(sms, "is_dev_environment").return_value = False
54
54
 
55
55
        service = self.make_monitor_service()
56
 
        mock_deferToThread = self.patch(sms, "deferToThread")
 
56
        mock_ensureServices = self.patch(service_monitor, "ensureServices")
57
57
        service.monitor_services()
58
58
        self.assertThat(
59
 
            mock_deferToThread,
60
 
            MockCalledOnceWith(service_monitor.ensure_all_services))
 
59
            mock_ensureServices,
 
60
            MockCalledOnceWith())