Show More
@@ -1,137 +1,136 b'' | |||||
1 | # coding: utf-8 |
|
1 | # coding: utf-8 | |
2 | """Test the /files/ handler.""" |
|
2 | """Test the /files/ handler.""" | |
3 |
|
3 | |||
4 | import io |
|
4 | import io | |
5 | import os |
|
5 | import os | |
6 | from unicodedata import normalize |
|
6 | from unicodedata import normalize | |
7 |
|
7 | |||
8 | pjoin = os.path.join |
|
8 | pjoin = os.path.join | |
9 |
|
9 | |||
10 | import requests |
|
10 | import requests | |
11 | import json |
|
11 | import json | |
12 | import binascii |
|
12 | import binascii | |
13 |
|
13 | |||
14 | from IPython.nbformat.current import (new_notebook, write, new_worksheet, |
|
14 | from IPython.nbformat.current import (new_notebook, write, new_worksheet, | |
15 | new_heading_cell, new_code_cell, |
|
15 | new_heading_cell, new_code_cell, | |
16 | new_output) |
|
16 | new_output) | |
17 |
|
17 | |||
18 | from IPython.html.utils import url_path_join |
|
18 | from IPython.html.utils import url_path_join | |
19 | from .launchnotebook import NotebookTestBase |
|
19 | from .launchnotebook import NotebookTestBase | |
20 | from IPython.utils import py3compat |
|
20 | from IPython.utils import py3compat | |
21 |
|
21 | |||
22 |
|
22 | |||
23 | class FilesTest(NotebookTestBase): |
|
23 | class FilesTest(NotebookTestBase): | |
24 | def test_hidden_files(self): |
|
24 | def test_hidden_files(self): | |
25 | not_hidden = [ |
|
25 | not_hidden = [ | |
26 | u'Γ₯ b', |
|
26 | u'Γ₯ b', | |
27 | u'Γ₯ b/Γ§. d', |
|
27 | u'Γ₯ b/Γ§. d', | |
28 | ] |
|
28 | ] | |
29 | hidden = [ |
|
29 | hidden = [ | |
30 | u'.Γ₯ b', |
|
30 | u'.Γ₯ b', | |
31 | u'Γ₯ b/.Γ§ d', |
|
31 | u'Γ₯ b/.Γ§ d', | |
32 | ] |
|
32 | ] | |
33 | dirs = not_hidden + hidden |
|
33 | dirs = not_hidden + hidden | |
34 |
|
34 | |||
35 | nbdir = self.notebook_dir.name |
|
35 | nbdir = self.notebook_dir.name | |
36 | for d in dirs: |
|
36 | for d in dirs: | |
37 | path = pjoin(nbdir, d.replace('/', os.sep)) |
|
37 | path = pjoin(nbdir, d.replace('/', os.sep)) | |
38 | if not os.path.exists(path): |
|
38 | if not os.path.exists(path): | |
39 | os.mkdir(path) |
|
39 | os.mkdir(path) | |
40 | with open(pjoin(path, 'foo'), 'w') as f: |
|
40 | with open(pjoin(path, 'foo'), 'w') as f: | |
41 | f.write('foo') |
|
41 | f.write('foo') | |
42 | with open(pjoin(path, '.foo'), 'w') as f: |
|
42 | with open(pjoin(path, '.foo'), 'w') as f: | |
43 | f.write('.foo') |
|
43 | f.write('.foo') | |
44 | url = self.base_url() |
|
44 | url = self.base_url() | |
45 |
|
45 | |||
46 | for d in not_hidden: |
|
46 | for d in not_hidden: | |
47 | path = pjoin(nbdir, d.replace('/', os.sep)) |
|
47 | path = pjoin(nbdir, d.replace('/', os.sep)) | |
48 | r = requests.get(url_path_join(url, 'files', d, 'foo')) |
|
48 | r = requests.get(url_path_join(url, 'files', d, 'foo')) | |
49 | r.raise_for_status() |
|
49 | r.raise_for_status() | |
50 | self.assertEqual(r.text, 'foo') |
|
50 | self.assertEqual(r.text, 'foo') | |
51 | r = requests.get(url_path_join(url, 'files', d, '.foo')) |
|
51 | r = requests.get(url_path_join(url, 'files', d, '.foo')) | |
52 | self.assertEqual(r.status_code, 404) |
|
52 | self.assertEqual(r.status_code, 404) | |
53 |
|
53 | |||
54 | for d in hidden: |
|
54 | for d in hidden: | |
55 | path = pjoin(nbdir, d.replace('/', os.sep)) |
|
55 | path = pjoin(nbdir, d.replace('/', os.sep)) | |
56 | for foo in ('foo', '.foo'): |
|
56 | for foo in ('foo', '.foo'): | |
57 | r = requests.get(url_path_join(url, 'files', d, foo)) |
|
57 | r = requests.get(url_path_join(url, 'files', d, foo)) | |
58 | self.assertEqual(r.status_code, 404) |
|
58 | self.assertEqual(r.status_code, 404) | |
59 |
|
59 | |||
60 | def test_contents_manager(self): |
|
60 | def test_contents_manager(self): | |
61 | "make sure ContentsManager returns right files (ipynb, bin, txt)." |
|
61 | "make sure ContentsManager returns right files (ipynb, bin, txt)." | |
62 |
|
62 | |||
63 | nbdir = self.notebook_dir.name |
|
63 | nbdir = self.notebook_dir.name | |
64 | base = self.base_url() |
|
64 | base = self.base_url() | |
65 |
|
65 | |||
66 | nb = new_notebook(name='testnb') |
|
66 | nb = new_notebook(name='testnb') | |
67 |
|
67 | |||
68 | ws = new_worksheet() |
|
68 | ws = new_worksheet() | |
69 | nb.worksheets = [ws] |
|
69 | nb.worksheets = [ws] | |
70 | ws.cells.append(new_heading_cell(u'Created by test Β³')) |
|
70 | ws.cells.append(new_heading_cell(u'Created by test Β³')) | |
71 | cc1 = new_code_cell(input=u'print(2*6)') |
|
71 | cc1 = new_code_cell(input=u'print(2*6)') | |
72 | cc1.outputs.append(new_output(output_text=u'12', output_type='stream')) |
|
72 | cc1.outputs.append(new_output(output_text=u'12', output_type='stream')) | |
73 | ws.cells.append(cc1) |
|
73 | ws.cells.append(cc1) | |
74 |
|
74 | |||
75 | with io.open(pjoin(nbdir, 'testnb.ipynb'), 'w', |
|
75 | with io.open(pjoin(nbdir, 'testnb.ipynb'), 'w', | |
76 | encoding='utf-8') as f: |
|
76 | encoding='utf-8') as f: | |
77 | write(nb, f, format='ipynb') |
|
77 | write(nb, f, format='ipynb') | |
78 |
|
78 | |||
79 | with io.open(pjoin(nbdir, 'test.bin'), 'wb') as f: |
|
79 | with io.open(pjoin(nbdir, 'test.bin'), 'wb') as f: | |
80 | f.write(b'\xff' + os.urandom(5)) |
|
80 | f.write(b'\xff' + os.urandom(5)) | |
81 | f.close() |
|
81 | f.close() | |
82 |
|
82 | |||
83 | with io.open(pjoin(nbdir, 'test.txt'), 'w') as f: |
|
83 | with io.open(pjoin(nbdir, 'test.txt'), 'w') as f: | |
84 | f.write(u'foobar') |
|
84 | f.write(u'foobar') | |
85 | f.close() |
|
85 | f.close() | |
86 |
|
86 | |||
87 | r = requests.get(url_path_join(base, 'files', 'testnb.ipynb')) |
|
87 | r = requests.get(url_path_join(base, 'files', 'testnb.ipynb')) | |
88 | self.assertEqual(r.status_code, 200) |
|
88 | self.assertEqual(r.status_code, 200) | |
89 | self.assertIn('print(2*6)', r.text) |
|
89 | self.assertIn('print(2*6)', r.text) | |
90 | json.loads(r.text) |
|
90 | json.loads(r.text) | |
91 |
|
91 | |||
92 | r = requests.get(url_path_join(base, 'files', 'test.bin')) |
|
92 | r = requests.get(url_path_join(base, 'files', 'test.bin')) | |
93 | self.assertEqual(r.status_code, 200) |
|
93 | self.assertEqual(r.status_code, 200) | |
94 | self.assertEqual(r.headers['content-type'], 'application/octet-stream') |
|
94 | self.assertEqual(r.headers['content-type'], 'application/octet-stream') | |
95 |
|
95 | self.assertEqual(r.content[0], 255) | ||
96 | self.assertEqual(binascii.hexlify(r.content[0]), 'ff') |
|
|||
97 | self.assertEqual(len(r.content), 6) |
|
96 | self.assertEqual(len(r.content), 6) | |
98 |
|
97 | |||
99 | r = requests.get(url_path_join(base, 'files', 'test.txt')) |
|
98 | r = requests.get(url_path_join(base, 'files', 'test.txt')) | |
100 | self.assertEqual(r.status_code, 200) |
|
99 | self.assertEqual(r.status_code, 200) | |
101 | self.assertEqual(r.headers['content-type'], 'text/plain') |
|
100 | self.assertEqual(r.headers['content-type'], 'text/plain') | |
102 | self.assertEqual(r.text, 'foobar') |
|
101 | self.assertEqual(r.text, 'foobar') | |
103 |
|
102 | |||
104 |
|
103 | |||
105 | def test_old_files_redirect(self): |
|
104 | def test_old_files_redirect(self): | |
106 | """pre-2.0 'files/' prefixed links are properly redirected""" |
|
105 | """pre-2.0 'files/' prefixed links are properly redirected""" | |
107 | nbdir = self.notebook_dir.name |
|
106 | nbdir = self.notebook_dir.name | |
108 | base = self.base_url() |
|
107 | base = self.base_url() | |
109 |
|
108 | |||
110 | os.mkdir(pjoin(nbdir, 'files')) |
|
109 | os.mkdir(pjoin(nbdir, 'files')) | |
111 | os.makedirs(pjoin(nbdir, 'sub', 'files')) |
|
110 | os.makedirs(pjoin(nbdir, 'sub', 'files')) | |
112 |
|
111 | |||
113 | for prefix in ('', 'sub'): |
|
112 | for prefix in ('', 'sub'): | |
114 | with open(pjoin(nbdir, prefix, 'files', 'f1.txt'), 'w') as f: |
|
113 | with open(pjoin(nbdir, prefix, 'files', 'f1.txt'), 'w') as f: | |
115 | f.write(prefix + '/files/f1') |
|
114 | f.write(prefix + '/files/f1') | |
116 | with open(pjoin(nbdir, prefix, 'files', 'f2.txt'), 'w') as f: |
|
115 | with open(pjoin(nbdir, prefix, 'files', 'f2.txt'), 'w') as f: | |
117 | f.write(prefix + '/files/f2') |
|
116 | f.write(prefix + '/files/f2') | |
118 | with open(pjoin(nbdir, prefix, 'f2.txt'), 'w') as f: |
|
117 | with open(pjoin(nbdir, prefix, 'f2.txt'), 'w') as f: | |
119 | f.write(prefix + '/f2') |
|
118 | f.write(prefix + '/f2') | |
120 | with open(pjoin(nbdir, prefix, 'f3.txt'), 'w') as f: |
|
119 | with open(pjoin(nbdir, prefix, 'f3.txt'), 'w') as f: | |
121 | f.write(prefix + '/f3') |
|
120 | f.write(prefix + '/f3') | |
122 |
|
121 | |||
123 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f1.txt') |
|
122 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f1.txt') | |
124 | r = requests.get(url) |
|
123 | r = requests.get(url) | |
125 | self.assertEqual(r.status_code, 200) |
|
124 | self.assertEqual(r.status_code, 200) | |
126 | self.assertEqual(r.text, prefix + '/files/f1') |
|
125 | self.assertEqual(r.text, prefix + '/files/f1') | |
127 |
|
126 | |||
128 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f2.txt') |
|
127 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f2.txt') | |
129 | r = requests.get(url) |
|
128 | r = requests.get(url) | |
130 | self.assertEqual(r.status_code, 200) |
|
129 | self.assertEqual(r.status_code, 200) | |
131 | self.assertEqual(r.text, prefix + '/files/f2') |
|
130 | self.assertEqual(r.text, prefix + '/files/f2') | |
132 |
|
131 | |||
133 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f3.txt') |
|
132 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f3.txt') | |
134 | r = requests.get(url) |
|
133 | r = requests.get(url) | |
135 | self.assertEqual(r.status_code, 200) |
|
134 | self.assertEqual(r.status_code, 200) | |
136 | self.assertEqual(r.text, prefix + '/f3') |
|
135 | self.assertEqual(r.text, prefix + '/f3') | |
137 |
|
136 |
General Comments 0
You need to be logged in to leave comments.
Login now