1
=== modified file 'src/maasserver/dns/tests/test_config.py'
2
--- src/maasserver/dns/tests/test_config.py	2015-12-10 10:31:31 +0000
3
+++ src/maasserver/dns/tests/test_config.py	2016-02-26 01:38:09 +0000
4
@@ -413,6 +413,8 @@
5
413
    def assertDNSMatches(self, hostname, domain, ip, version=4):
413
    def assertDNSMatches(self, hostname, domain, ip, version=4):
6
414
        # A forward lookup on the hostname returns the IP address.
414
        # A forward lookup on the hostname returns the IP address.
7
415
        fqdn = "%s.%s" % (hostname, domain)
415
        fqdn = "%s.%s" % (hostname, domain)
8
416
        # Give BIND enough time to process the rndc request.
9
417
        time.sleep(0.2)
10
416
        forward_lookup_result = self.dig_resolve(fqdn, version=version)
418
        forward_lookup_result = self.dig_resolve(fqdn, version=version)
11
417
        self.expectThat(
419
        self.expectThat(
12
418
            forward_lookup_result, Contains(ip),
420
            forward_lookup_result, Contains(ip),
13
419
421
14
=== modified file 'src/provisioningserver/dns/tests/test_config.py'
15
--- src/provisioningserver/dns/tests/test_config.py	2015-12-01 18:12:59 +0000
16
+++ src/provisioningserver/dns/tests/test_config.py	2016-02-26 01:38:09 +0000
17
@@ -168,7 +168,8 @@
18
168
class TestRNDCUtilities(MAASTestCase):
168
class TestRNDCUtilities(MAASTestCase):
19
169
169
20
170
    def test_generate_rndc_returns_configurations(self):
170
    def test_generate_rndc_returns_configurations(self):
22
171
        rndc_content, named_content = generate_rndc()
171
        rndc_content, named_content = generate_rndc(
23
172
            include_default_controls=False)
24
172
        # rndc_content and named_content look right.
173
        # rndc_content and named_content look right.
25
173
        self.assertIn('# Start of rndc.conf', rndc_content)
174
        self.assertIn('# Start of rndc.conf', rndc_content)
26
174
        self.assertIn('controls {', named_content)
175
        self.assertIn('controls {', named_content)
27
175
176
28
=== modified file 'src/provisioningserver/utils/fs.py'
29
--- src/provisioningserver/utils/fs.py	2015-12-01 18:12:59 +0000
30
+++ src/provisioningserver/utils/fs.py	2016-02-26 01:38:09 +0000
31
@@ -201,7 +201,7 @@
32
201
        raise
201
        raise
33
202
202
34
203
203
36
204
def pick_new_mtime(old_mtime=None, starting_age=1000):
204
def pick_new_mtime(old_mtime=None):
37
205
    """Choose a new modification time for a file that needs it updated.
205
    """Choose a new modification time for a file that needs it updated.
38
206
206
39
207
    This function is used to manage the modification time of files
207
    This function is used to manage the modification time of files
40
@@ -216,29 +216,20 @@
41
216
    time in the past when it is first written, and
216
    time in the past when it is first written, and
42
217
    increment it by 1 second on each subsequent write.
217
    increment it by 1 second on each subsequent write.
43
218
218
44
219
    However we also want to be careful not to set the modification time
45
220
    in the future, mostly because BIND does not deal with that very
46
221
    well.
47
222
48
223
    :param old_mtime: File's previous modification time, as a number
219
    :param old_mtime: File's previous modification time, as a number
49
224
        with a unity of one second, or None if it did not previously
220
        with a unity of one second, or None if it did not previously
50
225
        exist.
221
        exist.
51
226
    :param starting_age: If the file did not exist previously, set its
52
227
        modification time this many seconds in the past.
53
228
    """
222
    """
54
229
    now = time()
223
    now = time()
56
230
    if old_mtime is None:
224
    if old_mtime is None or old_mtime + 1 < now:
57
231
        # File is new.  Set modification time in the past to have room for
225
        # File is new.  Set modification time in the past to have room for
58
232
        # sub-second modifications.
226
        # sub-second modifications.
63
233
        return now - starting_age
227
        return now
64
234
    elif old_mtime + 1 <= now:
228
    else:
65
235
        # There is room to increment the file's mtime by one second
229
        # Let the file timestamp march into the future, so that BIND will
66
236
        # without ending up in the future.
230
        # reload the zone.  Our future selves will notice that mtime is enough
67
231
        # before the then-now to go back to having it match us.
68
237
        return old_mtime + 1
232
        return old_mtime + 1
69
238
    else:
70
239
        # We can't increase the file's modification time.  Give up and
71
240
        # return the previous modification time.
72
241
        return old_mtime
73
242
233
74
243
234
75
244
def incremental_write(content, filename, mode=0o600):
235
def incremental_write(content, filename, mode=0o600):
76
245
236
77
=== modified file 'src/provisioningserver/utils/tests/test_fs.py'
78
--- src/provisioningserver/utils/tests/test_fs.py	2015-12-01 18:12:59 +0000
79
+++ src/provisioningserver/utils/tests/test_fs.py	2016-02-26 01:38:09 +0000
80
@@ -258,8 +258,9 @@
81
258
        old_mtime = os.stat(filename).st_mtime - 10
258
        old_mtime = os.stat(filename).st_mtime - 10
82
259
        os.utime(filename, (old_mtime, old_mtime))
259
        os.utime(filename, (old_mtime, old_mtime))
83
260
        incremental_write(content, filename)
260
        incremental_write(content, filename)
84
261
        new_time = time.time()
85
261
        self.assertAlmostEqual(
262
        self.assertAlmostEqual(
87
262
            os.stat(filename).st_mtime, old_mtime + 1, delta=0.01)
263
            os.stat(filename).st_mtime, new_time, delta=0.01)
88
263
264
89
264
    def test_incremental_write_sets_permissions(self):
265
    def test_incremental_write_sets_permissions(self):
90
265
        atomic_file = self.make_file()
266
        atomic_file = self.make_file()
91
@@ -295,25 +296,16 @@
92
295
class TestPickNewMTime(MAASTestCase):
296
class TestPickNewMTime(MAASTestCase):
93
296
    """Test `pick_new_mtime`."""
297
    """Test `pick_new_mtime`."""
94
297
298
95
298
    def test_pick_new_mtime_applies_starting_age_to_new_file(self):
96
299
        before = time.time()
97
300
        starting_age = randint(0, 5)
98
301
        recommended_age = pick_new_mtime(None, starting_age=starting_age)
99
302
        now = time.time()
100
303
        self.assertAlmostEqual(
101
304
            now - starting_age,
102
305
            recommended_age,
103
306
            delta=(now - before))
104
307
105
308
    def test_pick_new_mtime_increments_mtime_if_possible(self):
299
    def test_pick_new_mtime_increments_mtime_if_possible(self):
108
309
        past = time.time() - 2
300
        now = time.time()
109
310
        self.assertEqual(past + 1, pick_new_mtime(past))
301
        new_time = pick_new_mtime(now - 2)
110
302
        self.assertAlmostEqual(new_time, now, delta=0.0001)
111
311
303
113
312
    def test_pick_new_mtime_refuses_to_move_mtime_into_the_future(self):
304
    def test_pick_new_mtime_happily_moves_mtime_into_the_future(self):
114
313
        # Race condition: this will fail if the test gets held up for
305
        # Race condition: this will fail if the test gets held up for
115
314
        # a second between readings of the clock.
306
        # a second between readings of the clock.
116
315
        now = time.time()
307
        now = time.time()
118
316
        self.assertEqual(now, pick_new_mtime(now))
308
        self.assertEqual(now + 1, pick_new_mtime(now))
119
317
309
120
318
310
121
319
class TestGetMAASProvisionCommand(MAASTestCase):
311
class TestGetMAASProvisionCommand(MAASTestCase):
Status:	Merged
Approved by:	LaMont Jones on 2016-02-26
Approved revision:	no longer in the source branch.
Merged at revision:	4583
Proposed branch:	lp:~lamont/maas/dns-failures-1.10
Merge into:	lp:maas/1.10
Diff against target:	121 lines (+18/-32) 4 files modified src/maasserver/dns/tests/test_config.py (+2/-0) src/provisioningserver/dns/tests/test_config.py (+2/-1) src/provisioningserver/utils/fs.py (+7/-16) src/provisioningserver/utils/tests/test_fs.py (+7/-15)
To merge this branch:	bzr merge lp:~lamont/maas/dns-failures-1.10
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Lee Trager (community)		2016-02-26	Approve on 2016-02-26
Review via email: mp+287253@code.launchpad.net