Merge pull request #342 from mterzo/pypuppetdb_upgrade

Update to latest pypuppetdb.
This commit is contained in:
Tim Meusel
2017-01-30 22:18:58 +01:00
committed by GitHub
2 changed files with 7 additions and 7 deletions

View File

@@ -5,5 +5,5 @@ MarkupSafe==0.19
WTForms==2.1 WTForms==2.1
Werkzeug==0.11.10 Werkzeug==0.11.10
itsdangerous==0.23 itsdangerous==0.23
pypuppetdb==0.3.1 pypuppetdb==0.3.2
requests==2.6.0 requests==2.6.0

View File

@@ -45,37 +45,37 @@ def mock_puppetdb_default_nodes(mocker):
latest_report_hash='1234567', latest_report_hash='1234567',
catalog_timestamp='2013-08-01T09:57:00.000Z', catalog_timestamp='2013-08-01T09:57:00.000Z',
facts_timestamp='2013-08-01T09:57:00.000Z', facts_timestamp='2013-08-01T09:57:00.000Z',
status='unreported'), status_report='unreported'),
Node('_', 'node-changed', Node('_', 'node-changed',
report_timestamp='2013-08-01T09:57:00.000Z', report_timestamp='2013-08-01T09:57:00.000Z',
latest_report_hash='1234567', latest_report_hash='1234567',
catalog_timestamp='2013-08-01T09:57:00.000Z', catalog_timestamp='2013-08-01T09:57:00.000Z',
facts_timestamp='2013-08-01T09:57:00.000Z', facts_timestamp='2013-08-01T09:57:00.000Z',
status='changed'), status_report='changed'),
Node('_', 'node-failed', Node('_', 'node-failed',
report_timestamp='2013-08-01T09:57:00.000Z', report_timestamp='2013-08-01T09:57:00.000Z',
latest_report_hash='1234567', latest_report_hash='1234567',
catalog_timestamp='2013-08-01T09:57:00.000Z', catalog_timestamp='2013-08-01T09:57:00.000Z',
facts_timestamp='2013-08-01T09:57:00.000Z', facts_timestamp='2013-08-01T09:57:00.000Z',
status='failed'), status_report='failed'),
Node('_', 'node-noop', Node('_', 'node-noop',
report_timestamp='2013-08-01T09:57:00.000Z', report_timestamp='2013-08-01T09:57:00.000Z',
latest_report_hash='1234567', latest_report_hash='1234567',
catalog_timestamp='2013-08-01T09:57:00.000Z', catalog_timestamp='2013-08-01T09:57:00.000Z',
facts_timestamp='2013-08-01T09:57:00.000Z', facts_timestamp='2013-08-01T09:57:00.000Z',
status='noop'), status_report='noop'),
Node('_', 'node-unchanged', Node('_', 'node-unchanged',
report_timestamp='2013-08-01T09:57:00.000Z', report_timestamp='2013-08-01T09:57:00.000Z',
latest_report_hash='1234567', latest_report_hash='1234567',
catalog_timestamp='2013-08-01T09:57:00.000Z', catalog_timestamp='2013-08-01T09:57:00.000Z',
facts_timestamp='2013-08-01T09:57:00.000Z', facts_timestamp='2013-08-01T09:57:00.000Z',
status='unchanged'), status_report='unchanged'),
Node('_', 'node-skipped', Node('_', 'node-skipped',
report_timestamp='2013-08-01T09:57:00.000Z', report_timestamp='2013-08-01T09:57:00.000Z',
latest_report_hash='1234567', latest_report_hash='1234567',
catalog_timestamp='2013-08-01T09:57:00.000Z', catalog_timestamp='2013-08-01T09:57:00.000Z',
facts_timestamp='2013-08-01T09:57:00.000Z', facts_timestamp='2013-08-01T09:57:00.000Z',
status='skipped') status_report='skipped')
] ]
return mocker.patch.object(app.puppetdb, 'nodes', return mocker.patch.object(app.puppetdb, 'nodes',