OneConf

Merge lp:~barry/oneconf/lp1269898 into lp:oneconf

  1. lp1269898
  2. Merge into trunk
Proposed by Barry Warsaw
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 275
Merged at revision: 273
Proposed branch: lp:~barry/oneconf/lp1269898
Merge into: lp:oneconf
Diff against target: 271 lines (+56/-31)
31 files modified
debian/changelog (+9/-0)
debian/control (+1/-1)
oneconf/paths.py (+18/-2)
test/data/integrationdatatests/host_brokenlatestsync/host (+1/-1)
test/data/integrationdatatests/host_brokenotherhosts/host (+1/-1)
test/data/integrationdatatests/host_brokenpackageset/host (+1/-1)
test/data/integrationdatatests/host_brokenpending/host (+1/-1)
test/data/syncdatatests/host_broken_pending_file/host (+1/-1)
test/data/syncdatatests/host_delete_current_host_error/host (+1/-1)
test/data/syncdatatests/host_fake_server_errors/host (+1/-1)
test/data/syncdatatests/host_firsttime_sync_other_host/host (+1/-1)
test/data/syncdatatests/host_nosilo_nopackage_onlyhost/host (+1/-1)
test/data/syncdatatests/host_nosilo_nopackage_onlyhost_noshare/host (+1/-1)
test/data/syncdatatests/host_only_current_host/host (+1/-1)
test/data/syncdatatests/host_previously_shared_notshared/host (+1/-1)
test/data/syncdatatests/host_previously_shared_with_packages_notshared/host (+1/-1)
test/data/syncdatatests/host_sync_a_newhost_with_already_other_hosts/host (+1/-1)
test/data/syncdatatests/host_sync_other_host_with_packages/host (+1/-1)
test/data/syncdatatests/host_sync_other_host_with_updated_hostname/host (+1/-1)
test/data/syncdatatests/host_sync_other_host_with_updated_packages/host (+1/-1)
test/data/syncdatatests/host_sync_remove_other_host/host (+1/-1)
test/data/syncdatatests/host_unshare_other_host/host (+1/-1)
test/data/syncdatatests/host_update_current_hostname/host (+1/-1)
test/data/syncdatatests/host_update_packages_for_current_host/host (+1/-1)
test/data/syncdatatests/host_with_packages/host (+1/-1)
test/data/syncdatatests/resulthost_firsttime_sync_other_host/host (+1/-1)
test/data/syncdatatests/resulthost_sync_a_newhost_with_already_other_hosts/host (+1/-1)
test/data/syncdatatests/resulthost_sync_other_host_with_packages/host (+1/-1)
test/data/syncdatatests/resulthost_sync_other_host_with_updated_hostname/host (+1/-1)
test/data/syncdatatests/resulthost_sync_other_host_with_updated_packages/host (+1/-1)
test/data/syncdatatests/resulthost_sync_remove_other_host/host (+1/-1)
To merge this branch: bzr merge lp:~barry/oneconf/lp1269898
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Needs Fixing
Michael Vogt Pending
Review via email: mp+211421@code.launchpad.net

Description of the change

Ensure a predictable FAKE_WALLPAPER path in all supported Python versions, since __file__ is absolute in Python 3.4 and relative in all older Pythons.

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

I think this only touches the test suite, and it only fixes the FTBFS. If it looks okay, I'm happy to merge and upload.

lp:~barry/oneconf/lp1269898 updated
275. By Barry Warsaw

d/control: Build-Depend on python3-all.

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looks good, please go ahead :)
Thanks!

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-08-27 23:49:55 +0000
3+++ debian/changelog 2014-03-17 21:46:05 +0000
4@@ -1,3 +1,12 @@
5+oneconf (0.3.6) trusty; urgency=medium
6+
7+ * d/control: Build-Depend on python3-all.
8+ * paths.py: Ensure a predictable FAKE_WALLPAPER path in all supported
9+ Python versions, since __file__ is absolute in Python 3.4 and relative
10+ in all older Pythons. (LP: #1269898)
11+
12+ -- Barry Warsaw <barry@ubuntu.com> Thu, 16 Jan 2014 13:25:41 -0500
13+
14 oneconf (0.3.5) saucy; urgency=low
15
16 * oneconf/distributor/Ubuntu.py: close the apt cache when we are done using
17
18=== modified file 'debian/control'
19--- debian/control 2013-08-27 23:23:55 +0000
20+++ debian/control 2014-03-17 21:46:05 +0000
21@@ -15,7 +15,7 @@
22 python-gi,
23 python-piston-mini-client,
24 python-dbus,
25- python3,
26+ python3-all,
27 python3-setuptools,
28 python3-distutils-extra,
29 python3-nose,
30
31=== modified file 'oneconf/paths.py'
32--- oneconf/paths.py 2012-12-20 22:04:47 +0000
33+++ oneconf/paths.py 2014-03-17 21:46:05 +0000
34@@ -48,6 +48,22 @@
35
36 if not os.path.exists(_datadir):
37 # take the paths file if loaded from networksync module
38+ #
39+ # 2014-03-17 barry: It's probably not a good idea to use __file__, since
40+ # the behavior of that has changed between Python 3.3 and 3.4. Prior to
41+ # 3.4, __file__ was a relative path, but in 3.4 it became absolute (which
42+ # it always should have been). Because the file's *path* is the input to
43+ # the logo checksum (as opposed to the file's contents, because...?) this
44+ # value actually matters.
45+ #
46+ # However, making the FAKE_WALLPAPER path below absolute breaks the
47+ # package's build because inside a chroot, the absolute path of __file__
48+ # is unpredictable. LP: #1269898.
49+ #
50+ # The solution then is to make the FAKE_WALLPAPER path relative to the
51+ # current working directory, via os.path.relpath(). So first, we ensure
52+ # it's absolute (for older Pythons) and then relpath it. *That's* the
53+ # path that will be the input to the SHA224 checksum.
54 parent = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
55 _datadir = os.path.join(parent, "data")
56 if not os.path.exists(_datadir):
57@@ -62,8 +78,8 @@
58 config.read(ONECONF_OVERRIDE_FILE)
59 ONECONF_CACHE_DIR = config.get('TestSuite', 'ONECONF_CACHE_DIR')
60 WEBCATALOG_SILO_DIR = config.get('TestSuite', 'WEBCATALOG_SILO_DIR')
61- FAKE_WALLPAPER = os.path.join(
62- os.path.dirname(_datadir), config.get('TestSuite', 'FAKE_WALLPAPER'))
63+ FAKE_WALLPAPER = os.path.relpath(os.path.abspath(os.path.join(
64+ os.path.dirname(_datadir), config.get('TestSuite', 'FAKE_WALLPAPER'))))
65 try:
66 FAKE_WALLPAPER_MTIME = config.get('TestSuite', 'FAKE_WALLPAPER_MTIME')
67 except NoOptionError:
68
69=== modified file 'test/data/integrationdatatests/host_brokenlatestsync/host'
70--- test/data/integrationdatatests/host_brokenlatestsync/host 2012-06-04 08:46:41 +0000
71+++ test/data/integrationdatatests/host_brokenlatestsync/host 2014-03-17 21:46:05 +0000
72@@ -1,1 +1,1 @@
73-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": false}
74\ No newline at end of file
75+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": false}
76\ No newline at end of file
77
78=== modified file 'test/data/integrationdatatests/host_brokenotherhosts/host'
79--- test/data/integrationdatatests/host_brokenotherhosts/host 2012-06-04 08:46:41 +0000
80+++ test/data/integrationdatatests/host_brokenotherhosts/host 2014-03-17 21:46:05 +0000
81@@ -1,1 +1,1 @@
82-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": false}
83\ No newline at end of file
84+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": false}
85\ No newline at end of file
86
87=== modified file 'test/data/integrationdatatests/host_brokenpackageset/host'
88--- test/data/integrationdatatests/host_brokenpackageset/host 2012-06-04 08:46:41 +0000
89+++ test/data/integrationdatatests/host_brokenpackageset/host 2014-03-17 21:46:05 +0000
90@@ -1,1 +1,1 @@
91-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": aaaa, "share_inventory": false}
92+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": aaaa, "share_inventory": false}
93
94=== modified file 'test/data/integrationdatatests/host_brokenpending/host'
95--- test/data/integrationdatatests/host_brokenpending/host 2012-06-04 08:46:41 +0000
96+++ test/data/integrationdatatests/host_brokenpending/host 2014-03-17 21:46:05 +0000
97@@ -1,1 +1,1 @@
98-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": false}
99\ No newline at end of file
100+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": false}
101\ No newline at end of file
102
103=== modified file 'test/data/syncdatatests/host_broken_pending_file/host'
104--- test/data/syncdatatests/host_broken_pending_file/host 2012-06-04 08:46:41 +0000
105+++ test/data/syncdatatests/host_broken_pending_file/host 2014-03-17 21:46:05 +0000
106@@ -1,1 +1,1 @@
107-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": false}
108\ No newline at end of file
109+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": false}
110\ No newline at end of file
111
112=== modified file 'test/data/syncdatatests/host_delete_current_host_error/host'
113--- test/data/syncdatatests/host_delete_current_host_error/host 2012-06-04 08:46:41 +0000
114+++ test/data/syncdatatests/host_delete_current_host_error/host 2014-03-17 21:46:05 +0000
115@@ -1,1 +1,1 @@
116-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "newlist", "share_inventory": false}
117+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "newlist", "share_inventory": false}
118
119=== modified file 'test/data/syncdatatests/host_fake_server_errors/host'
120--- test/data/syncdatatests/host_fake_server_errors/host 2012-12-10 22:50:04 +0000
121+++ test/data/syncdatatests/host_fake_server_errors/host 2014-03-17 21:46:05 +0000
122@@ -1,1 +1,1 @@
123-{"hostid": "0000", "logo_checksum": "438192ba13cf9f062504a749c86a72034851a39ffa3f9af25c05249e0000000000.000042", "hostname": "foomachine", "packages_checksum": "newlist", "share_inventory": true}
124+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "newlist", "share_inventory": true}
125
126=== modified file 'test/data/syncdatatests/host_firsttime_sync_other_host/host'
127--- test/data/syncdatatests/host_firsttime_sync_other_host/host 2012-06-04 08:46:41 +0000
128+++ test/data/syncdatatests/host_firsttime_sync_other_host/host 2014-03-17 21:46:05 +0000
129@@ -1,1 +1,1 @@
130-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
131+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
132
133=== modified file 'test/data/syncdatatests/host_nosilo_nopackage_onlyhost/host'
134--- test/data/syncdatatests/host_nosilo_nopackage_onlyhost/host 2012-06-04 08:46:41 +0000
135+++ test/data/syncdatatests/host_nosilo_nopackage_onlyhost/host 2014-03-17 21:46:05 +0000
136@@ -1,1 +1,1 @@
137-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": true}
138+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": null, "share_inventory": true}
139
140=== modified file 'test/data/syncdatatests/host_nosilo_nopackage_onlyhost_noshare/host'
141--- test/data/syncdatatests/host_nosilo_nopackage_onlyhost_noshare/host 2012-06-04 08:46:41 +0000
142+++ test/data/syncdatatests/host_nosilo_nopackage_onlyhost_noshare/host 2014-03-17 21:46:05 +0000
143@@ -1,1 +1,1 @@
144-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "dab2fbc6250b6fea7a245e3eedb7bfdba7578d93bbc2df6c787d61271319017141.562973", "share_inventory": false}
145+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "dab2fbc6250b6fea7a245e3eedb7bfdba7578d93bbc2df6c787d61271319017141.562973", "share_inventory": false}
146
147=== modified file 'test/data/syncdatatests/host_only_current_host/host'
148--- test/data/syncdatatests/host_only_current_host/host 2012-06-04 08:46:41 +0000
149+++ test/data/syncdatatests/host_only_current_host/host 2014-03-17 21:46:05 +0000
150@@ -1,1 +1,1 @@
151-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
152+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
153
154=== modified file 'test/data/syncdatatests/host_previously_shared_notshared/host'
155--- test/data/syncdatatests/host_previously_shared_notshared/host 2012-06-04 08:46:41 +0000
156+++ test/data/syncdatatests/host_previously_shared_notshared/host 2014-03-17 21:46:05 +0000
157@@ -1,1 +1,1 @@
158-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "dab2fbc6250b6fea7a245e3eedb7bfdba7578d93bbc2df6c787d61271319017141.562973", "share_inventory": false}
159+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "dab2fbc6250b6fea7a245e3eedb7bfdba7578d93bbc2df6c787d61271319017141.562973", "share_inventory": false}
160
161=== modified file 'test/data/syncdatatests/host_previously_shared_with_packages_notshared/host'
162--- test/data/syncdatatests/host_previously_shared_with_packages_notshared/host 2012-06-04 08:46:41 +0000
163+++ test/data/syncdatatests/host_previously_shared_with_packages_notshared/host 2014-03-17 21:46:05 +0000
164@@ -1,1 +1,1 @@
165-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": false}
166+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": false}
167
168=== modified file 'test/data/syncdatatests/host_sync_a_newhost_with_already_other_hosts/host'
169--- test/data/syncdatatests/host_sync_a_newhost_with_already_other_hosts/host 2012-06-04 08:46:41 +0000
170+++ test/data/syncdatatests/host_sync_a_newhost_with_already_other_hosts/host 2014-03-17 21:46:05 +0000
171@@ -1,1 +1,1 @@
172-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
173+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
174
175=== modified file 'test/data/syncdatatests/host_sync_other_host_with_packages/host'
176--- test/data/syncdatatests/host_sync_other_host_with_packages/host 2012-06-04 08:46:41 +0000
177+++ test/data/syncdatatests/host_sync_other_host_with_packages/host 2014-03-17 21:46:05 +0000
178@@ -1,1 +1,1 @@
179-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
180+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
181
182=== modified file 'test/data/syncdatatests/host_sync_other_host_with_updated_hostname/host'
183--- test/data/syncdatatests/host_sync_other_host_with_updated_hostname/host 2012-06-04 08:46:41 +0000
184+++ test/data/syncdatatests/host_sync_other_host_with_updated_hostname/host 2014-03-17 21:46:05 +0000
185@@ -1,1 +1,1 @@
186-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
187+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
188
189=== modified file 'test/data/syncdatatests/host_sync_other_host_with_updated_packages/host'
190--- test/data/syncdatatests/host_sync_other_host_with_updated_packages/host 2012-06-04 08:46:41 +0000
191+++ test/data/syncdatatests/host_sync_other_host_with_updated_packages/host 2014-03-17 21:46:05 +0000
192@@ -1,1 +1,1 @@
193-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
194+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
195
196=== modified file 'test/data/syncdatatests/host_sync_remove_other_host/host'
197--- test/data/syncdatatests/host_sync_remove_other_host/host 2012-06-04 08:46:41 +0000
198+++ test/data/syncdatatests/host_sync_remove_other_host/host 2014-03-17 21:46:05 +0000
199@@ -1,1 +1,1 @@
200-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
201+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
202
203=== modified file 'test/data/syncdatatests/host_unshare_other_host/host'
204--- test/data/syncdatatests/host_unshare_other_host/host 2012-06-04 08:46:41 +0000
205+++ test/data/syncdatatests/host_unshare_other_host/host 2014-03-17 21:46:05 +0000
206@@ -1,1 +1,1 @@
207-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "dab2fbc6250b6fea7a245e3eedb7bfdba7578d93bbc2df6c787d61271319017141.562973", "share_inventory": false}
208+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "dab2fbc6250b6fea7a245e3eedb7bfdba7578d93bbc2df6c787d61271319017141.562973", "share_inventory": false}
209
210=== modified file 'test/data/syncdatatests/host_update_current_hostname/host'
211--- test/data/syncdatatests/host_update_current_hostname/host 2012-06-04 08:46:41 +0000
212+++ test/data/syncdatatests/host_update_current_hostname/host 2014-03-17 21:46:05 +0000
213@@ -1,1 +1,1 @@
214-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "barmachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
215+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "barmachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
216
217=== modified file 'test/data/syncdatatests/host_update_packages_for_current_host/host'
218--- test/data/syncdatatests/host_update_packages_for_current_host/host 2012-06-04 08:46:41 +0000
219+++ test/data/syncdatatests/host_update_packages_for_current_host/host 2014-03-17 21:46:05 +0000
220@@ -1,1 +1,1 @@
221-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "AAAA", "share_inventory": true}
222+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "AAAA", "share_inventory": true}
223
224=== modified file 'test/data/syncdatatests/host_with_packages/host'
225--- test/data/syncdatatests/host_with_packages/host 2012-06-04 08:46:41 +0000
226+++ test/data/syncdatatests/host_with_packages/host 2014-03-17 21:46:05 +0000
227@@ -1,1 +1,1 @@
228-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
229+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
230
231=== modified file 'test/data/syncdatatests/resulthost_firsttime_sync_other_host/host'
232--- test/data/syncdatatests/resulthost_firsttime_sync_other_host/host 2012-06-04 08:46:41 +0000
233+++ test/data/syncdatatests/resulthost_firsttime_sync_other_host/host 2014-03-17 21:46:05 +0000
234@@ -1,1 +1,1 @@
235-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
236+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
237
238=== modified file 'test/data/syncdatatests/resulthost_sync_a_newhost_with_already_other_hosts/host'
239--- test/data/syncdatatests/resulthost_sync_a_newhost_with_already_other_hosts/host 2012-06-04 08:46:41 +0000
240+++ test/data/syncdatatests/resulthost_sync_a_newhost_with_already_other_hosts/host 2014-03-17 21:46:05 +0000
241@@ -1,1 +1,1 @@
242-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
243+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
244
245=== modified file 'test/data/syncdatatests/resulthost_sync_other_host_with_packages/host'
246--- test/data/syncdatatests/resulthost_sync_other_host_with_packages/host 2012-06-04 08:46:41 +0000
247+++ test/data/syncdatatests/resulthost_sync_other_host_with_packages/host 2014-03-17 21:46:05 +0000
248@@ -1,1 +1,1 @@
249-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
250+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
251
252=== modified file 'test/data/syncdatatests/resulthost_sync_other_host_with_updated_hostname/host'
253--- test/data/syncdatatests/resulthost_sync_other_host_with_updated_hostname/host 2012-06-04 08:46:41 +0000
254+++ test/data/syncdatatests/resulthost_sync_other_host_with_updated_hostname/host 2014-03-17 21:46:05 +0000
255@@ -1,1 +1,1 @@
256-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
257+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
258
259=== modified file 'test/data/syncdatatests/resulthost_sync_other_host_with_updated_packages/host'
260--- test/data/syncdatatests/resulthost_sync_other_host_with_updated_packages/host 2012-06-04 08:46:41 +0000
261+++ test/data/syncdatatests/resulthost_sync_other_host_with_updated_packages/host 2014-03-17 21:46:05 +0000
262@@ -1,1 +1,1 @@
263-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
264+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
265
266=== modified file 'test/data/syncdatatests/resulthost_sync_remove_other_host/host'
267--- test/data/syncdatatests/resulthost_sync_remove_other_host/host 2012-06-04 08:46:41 +0000
268+++ test/data/syncdatatests/resulthost_sync_remove_other_host/host 2014-03-17 21:46:05 +0000
269@@ -1,1 +1,1 @@
270-{"hostid": "0000", "logo_checksum": "c7e18f80419ea665772fef10e347f244d5ba596cc2764a8e611603060000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}
271+{"hostid": "0000", "logo_checksum": "da2ff07f545c6f3ba06629ccb35f42d8ba4055eedb2a8a4818e8a5ca0000000000.000042", "hostname": "foomachine", "packages_checksum": "9c0d4e619c445551541af522b39ab483ba943b8b298fb96ccc3acd0b", "share_inventory": true}

Subscribers

People subscribed via source and target branches