diff options
| author | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2018-11-14 00:00:00 +0000 |
|---|---|---|
| committer | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2018-11-17 13:00:07 +0100 |
| commit | d9291a127654dc94b92c758dcdb2f3d421087841 (patch) | |
| tree | d0a0b756ace3767ea4b262c3d286608c64429d8e /tests | |
| parent | 08f7bda8af62791f88f92f0190954aa5214c779f (diff) | |
| download | dconf-d9291a127654dc94b92c758dcdb2f3d421087841.tar.gz | |
tests: Update should indicate failure with non-zero exit code
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/test-dconf.py | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/tests/test-dconf.py b/tests/test-dconf.py index b277b1f..202dc9f 100755 --- a/tests/test-dconf.py +++ b/tests/test-dconf.py @@ -599,6 +599,68 @@ class DBusTest(unittest.TestCase): # Now database should be marked as invalid. self.assertEqual(b'\0'*8, mm[:8]) + @unittest.expectedFailure + def test_update_failure(self): + """Update should skip invalid configuration directory and continue with + others. Failure to update one of databases should be indicated with + non-zero exit code. + + Regression test for issue #42. + """ + + # A few different scenarios when loading data from key-file: + valid_key_file = '[org]\na = 1' + + invalid_key_file = "<html>This isn't a key-file nor valid HTML." + + invalid_group_name = dedent('''\ + [org//no/me] + a = 2 + ''') + + invalid_key_name = dedent('''\ + [org/gnome] + b// = 2 + ''') + + invalid_value = dedent('''\ + [org/gnome] + c = 2x2 + ''') + + db = os.path.join(self.temporary_dir.name, 'db') + + # Database name, valid, content + cases = [('site_aa', True, valid_key_file), + ('site_bb', False, invalid_key_file), + ('site_cc', False, invalid_group_name), + ('site_dd', False, invalid_key_name), + ('site_ee', False, invalid_value), + ('site_ff', True, valid_key_file)] + + for (name, is_valid, content) in cases: + conf_dir = os.path.join(db, '{}.d'.format(name)) + conf_file = os.path.join(conf_dir, '{}.conf'.format(name)) + + os.makedirs(conf_dir) + + with open(conf_file, 'w') as file: + file.write(content) + + # Return code should indicate failure. + with self.assertRaises(subprocess.CalledProcessError) as cm: + dconf('update', db, stderr=subprocess.PIPE) + + for (name, is_valid, content) in cases: + path = os.path.join(db, name) + if is_valid: + # This one was valid so db should be written successfully. + self.assertTrue(os.path.exists(path)) + self.assertNotRegex(cm.exception.stderr, name) + else: + # This one was broken so we shouldn't create corresponding db. + self.assertFalse(os.path.exists(path)) + self.assertRegex(cm.exception.stderr, name) if __name__ == '__main__': # Make sure we don't pick up mandatory profile. |