txpkgupload

Merge ~cjwatson/txpkgupload:py3-writeChunk-bytes into txpkgupload:master

  1. Git
  2. lp:~cjwatson/txpkgupload
  3. py3-writeChunk-bytes
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: c52c2f14b08ea43ed3cb4c29cc67671297d59ccf
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/txpkgupload:py3-writeChunk-bytes
Merge into: txpkgupload:master
Diff against target: 97 lines (+12/-11)
2 files modified
src/txpkgupload/tests/test_plugin.py (+10/-9)
src/txpkgupload/tests/test_twistedsftp.py (+2/-2)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+392888@code.launchpad.net

Commit message

Explicitly pass bytes to writeChunk in tests

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/txpkgupload/tests/test_plugin.py b/src/txpkgupload/tests/test_plugin.py
2index 7d8450d..29418af 100644
3--- a/src/txpkgupload/tests/test_plugin.py
4+++ b/src/txpkgupload/tests/test_plugin.py
5@@ -534,7 +534,7 @@ class TestPkgUploadServiceMakerMixin:
6 The uploaded file permissions are also special (g+rwxs).
7 """
8 client = yield self.server.getClient()
9- yield self.server.createFile(client, "foo/bar/baz", "fake contents")
10+ yield self.server.createFile(client, "foo/bar/baz", b"fake contents")
11
12 yield self.server.disconnect(client)
13 yield self.server.waitForClose()
14@@ -563,7 +563,8 @@ class TestPkgUploadServiceMakerMixin:
15 for upload in files:
16 fake_file = StringIO.StringIO(upload)
17 file_to_upload = "~ppa-user/ppa/ubuntu/%s" % upload
18- yield self.server.createFile(client, file_to_upload, upload)
19+ yield self.server.createFile(
20+ client, file_to_upload, upload.encode("ASCII"))
21
22 yield self.server.disconnect(client)
23 yield self.server.waitForClose()
24@@ -598,12 +599,12 @@ class TestPkgUploadServiceMakerMixin:
25 """
26 # Perform a pair of sessions with distinct connections in time.
27 conn_one = yield self.server.getClient()
28- yield self.server.createFile(conn_one, "test", "ONE")
29+ yield self.server.createFile(conn_one, "test", b"ONE")
30 yield self.server.disconnect(conn_one)
31 yield self.server.waitForClose(1)
32
33 conn_two = yield self.server.getClient()
34- yield self.server.createFile(conn_two, "test", "TWO")
35+ yield self.server.createFile(conn_two, "test", b"TWO")
36 yield self.server.disconnect(conn_two)
37 yield self.server.waitForClose(2)
38
39@@ -611,9 +612,9 @@ class TestPkgUploadServiceMakerMixin:
40 conn_three = yield self.server.getClient()
41 conn_four = yield self.server.getClient()
42
43- yield self.server.createFile(conn_three, "test", "THREE")
44+ yield self.server.createFile(conn_three, "test", b"THREE")
45
46- yield self.server.createFile(conn_four, "test", "FOUR")
47+ yield self.server.createFile(conn_four, "test", b"FOUR")
48
49 yield self.server.disconnect(conn_three)
50 yield self.server.waitForClose(3)
51@@ -682,7 +683,7 @@ class TestPkgUploadServiceMakerSFTP(TestPkgUploadServiceMakerMixin, TestCase):
52 def test_stat(self):
53 """Check that attribute retrieval doesn't give anything away."""
54 client = yield self.server.getClient()
55- yield self.server.createFile(client, "foo/bar/baz", "fake contents")
56+ yield self.server.createFile(client, "foo/bar/baz", b"fake contents")
57 attrs = yield client.getAttrs("foo/bar/baz")
58 self.assertEqual({}, attrs)
59
60@@ -693,7 +694,7 @@ class TestPkgUploadServiceMakerSFTP(TestPkgUploadServiceMakerMixin, TestCase):
61 def test_fstat(self):
62 """Check that file attribute retrieval doesn't give anything away."""
63 client = yield self.server.getClient()
64- yield self.server.createFile(client, "foo/bar/baz", "fake contents")
65+ yield self.server.createFile(client, "foo/bar/baz", b"fake contents")
66 remote_file = yield client.openFile("foo/bar/baz", FXF_READ, {})
67 attrs = yield remote_file.getAttrs()
68 self.assertEqual({}, attrs)
69@@ -706,7 +707,7 @@ class TestPkgUploadServiceMakerSFTP(TestPkgUploadServiceMakerMixin, TestCase):
70 def test_openDirectory(self):
71 """Check that opening a directory doesn't give anything away."""
72 client = yield self.server.getClient()
73- yield self.server.createFile(client, "foo/bar/baz", "fake contents")
74+ yield self.server.createFile(client, "foo/bar/baz", b"fake contents")
75 directory = yield client.openDirectory(".")
76 try:
77 entry = yield next(directory)
78diff --git a/src/txpkgupload/tests/test_twistedsftp.py b/src/txpkgupload/tests/test_twistedsftp.py
79index bf002ca..3ddeeb0 100644
80--- a/src/txpkgupload/tests/test_twistedsftp.py
81+++ b/src/txpkgupload/tests/test_twistedsftp.py
82@@ -62,7 +62,7 @@ class TestSFTPServer(testtools.TestCase):
83
84 def test_file_creation(self):
85 upload_file = self.sftp_server.openFile('foo/bar', None, None)
86- upload_file.writeChunk(0, "This is a test")
87+ upload_file.writeChunk(0, b"This is a test")
88 file_name = os.path.join(self.sftp_server._current_upload, 'foo/bar')
89 test_file = open(file_name, 'r')
90 self.assertEqual(test_file.read(), "This is a test")
91@@ -72,5 +72,5 @@ class TestSFTPServer(testtools.TestCase):
92 os.makedirs(dir_name)
93 upload_file = self.sftp_server.openFile('bar/foo', None, None)
94 err = self.assertRaises(
95- FileIsADirectory, upload_file.writeChunk, 0, "This is a test")
96+ FileIsADirectory, upload_file.writeChunk, 0, b"This is a test")
97 self.assertEqual("File is a directory: '%s'" % dir_name, str(err))

Subscribers

People subscribed via source and target branches

to all changes: