Merge lp:~smoser/simplestreams/trunk.python3-make-test-data into lp:simplestreams

[Scott Moser]

Fix make-test-data for python3.

make-test-data had some bytes-versus-strings issues preventing it
from running with python3.

The fixes are here, and now both of these work:
  export SS_SKIP_UNSUPPORTED=1 SS_DEBUG_MIN_SERIAL=20180101 REAL_DATA=1
  ./tools/tenv python ./tools/make-test-data exdata-query/ exdata/data
  ./tools/tenv python3 ./tools/make-test-data exdata-query/ exdata/data3

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:458
https://jenkins.ubuntu.com/server/job/simplestreams-ci/50/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/50
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-arm64/50
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/50
    SUCCESS: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/50

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/50/rebuild

review: Approve (continuous-integration)

[Dan Watkins (oddbloke)]

review: Approve

=== modified file 'tools/make-test-data'
--- tools/make-test-data	2018-01-16 17:59:19 +0000
+++ tools/make-test-data	2018-02-16 19:27:17 +0000
@@ -108,7 +108,7 @@
 def save_cache():
     if FILE_DATA:
         hashcache = FILE_DATA['filename']
-        with open(hashcache, "w") as hfp:
+        with open(hashcache, "wb") as hfp:
             hfp.write(util.dump_data(FILE_DATA))
 
 
@@ -597,9 +597,9 @@
 
         outfile = os.path.join(out_d, stream, streamdir, cid + ".json")
         util.mkdir_p(os.path.dirname(outfile))
-        with open(outfile, "w") as fp:
+        with open(outfile, "wb") as fp:
             sys.stderr.write("writing %s\n" % outfile)
-            fp.write(util.dump_data(tree[stream]) + "\n")
+            fp.write(util.dump_data(tree[stream]) + b"\n")
 
     # save hashes data
     save_cache()
@@ -689,9 +689,9 @@
 
         outfile = os.path.join(args.out_d, streamname, streamdir, 'index.json')
         util.mkdir_p(os.path.dirname(outfile))
-        with open(outfile, "w") as fp:
+        with open(outfile, "wb") as fp:
             sys.stderr.write("writing %s\n" % outfile)
-            fp.write(util.dump_data(index) + "\n")
+            fp.write(util.dump_data(index) + b"\n")
 
     if args.sign:
         def printstatus(name):