Merge ~mpontillo/maas:fix-maasserver-tests-test-js into maas:master

Proposed by Mike Pontillo on 2018-03-09
Status: Merged
Approved by: Mike Pontillo on 2018-03-09
Approved revision: f7ad0a6f177d8fa20b783b16bd512140fa7567e3
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~mpontillo/maas:fix-maasserver-tests-test-js
Merge into: maas:master
Diff against target: 74 lines (+8/-8)
5 files modified
src/maasserver/static/js/tests/test_enums.html (+1/-1)
src/maasserver/static/js/tests/test_os_distro_select.html (+2/-2)
src/maasserver/static/js/tests/test_prefs.html (+2/-2)
src/maasserver/static/js/tests/test_reveal.html (+1/-1)
src/maasserver/static/js/tests/test_shortpoll.html (+2/-2)
Reviewer Review Type Date Requested Status
Blake Rouse (community) 2018-03-09 Approve on 2018-03-09
Review via email: mp+341233@code.launchpad.net

Commit message

Fix maasserver.tests.test_js.

To post a comment you must log in.
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/js/tests/test_enums.html b/src/maasserver/static/js/tests/test_enums.html
2index 4ed6c36..b9dc4fc 100644
3--- a/src/maasserver/static/js/tests/test_enums.html
4+++ b/src/maasserver/static/js/tests/test_enums.html
5@@ -10,7 +10,7 @@
6 <script type="text/javascript" src="../testing/testing.js"></script>
7 <script type="text/javascript" src="../node.js"></script>
8 <!-- The module under test -->
9- <script type="text/javascript" src="../enums.js"></script>
10+ <script type="text/javascript" src="../yui/enums.js"></script>
11 <!-- The test suite -->
12 <script type="text/javascript" src="test_enums.js"></script>
13 <script type="text/javascript">
14diff --git a/src/maasserver/static/js/tests/test_os_distro_select.html b/src/maasserver/static/js/tests/test_os_distro_select.html
15index eff1bb1..f87a3f8 100644
16--- a/src/maasserver/static/js/tests/test_os_distro_select.html
17+++ b/src/maasserver/static/js/tests/test_os_distro_select.html
18@@ -8,9 +8,9 @@
19 <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
20 <script type="text/javascript" src="../testing/testrunner.js"></script>
21 <script type="text/javascript" src="../testing/testing.js"></script>
22- <script type="text/javascript" src="../io.js"></script>
23+ <script type="text/javascript" src="../yui/io.js"></script>
24 <!-- The module under test -->
25- <script type="text/javascript" src="../os_distro_select.js"></script>
26+ <script type="text/javascript" src="../yui/os_distro_select.js"></script>
27 <!-- The test suite -->
28 <script type="text/javascript" src="test_os_distro_select.js"></script>
29 </head>
30diff --git a/src/maasserver/static/js/tests/test_prefs.html b/src/maasserver/static/js/tests/test_prefs.html
31index 63bbd33..989e9df 100644
32--- a/src/maasserver/static/js/tests/test_prefs.html
33+++ b/src/maasserver/static/js/tests/test_prefs.html
34@@ -8,9 +8,9 @@
35 <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
36 <script type="text/javascript" src="../testing/testrunner.js"></script>
37 <script type="text/javascript" src="../testing/testing.js"></script>
38- <script type="text/javascript" src="../io.js"></script>
39+ <script type="text/javascript" src="../yui/io.js"></script>
40 <!-- The module under test -->
41- <script type="text/javascript" src="../prefs.js"></script>
42+ <script type="text/javascript" src="../yui/prefs.js"></script>
43 <!-- The test suite -->
44 <script type="text/javascript" src="test_prefs.js"></script>
45 <script type="text/javascript">
46diff --git a/src/maasserver/static/js/tests/test_reveal.html b/src/maasserver/static/js/tests/test_reveal.html
47index 6847cb7..26a40b1 100644
48--- a/src/maasserver/static/js/tests/test_reveal.html
49+++ b/src/maasserver/static/js/tests/test_reveal.html
50@@ -9,7 +9,7 @@
51 <script type="text/javascript" src="../testing/testrunner.js"></script>
52 <script type="text/javascript" src="../testing/testing.js"></script>
53 <!-- The module under test -->
54- <script type="text/javascript" src="../reveal.js"></script>
55+ <script type="text/javascript" src="../yui/reveal.js"></script>
56 <!-- The test suite -->
57 <script type="text/javascript" src="test_reveal.js"></script>
58 </head>
59diff --git a/src/maasserver/static/js/tests/test_shortpoll.html b/src/maasserver/static/js/tests/test_shortpoll.html
60index c6399bc..f0bffc5 100644
61--- a/src/maasserver/static/js/tests/test_shortpoll.html
62+++ b/src/maasserver/static/js/tests/test_shortpoll.html
63@@ -8,9 +8,9 @@
64 <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
65 <script type="text/javascript" src="../testing/testrunner.js"></script>
66 <script type="text/javascript" src="../testing/testing.js"></script>
67- <script type="text/javascript" src="../io.js"></script>
68+ <script type="text/javascript" src="../yui/io.js"></script>
69 <!-- The module under test -->
70- <script type="text/javascript" src="../shortpoll.js"></script>
71+ <script type="text/javascript" src="../yui/shortpoll.js"></script>
72 <!-- The test suite -->
73 <script type="text/javascript" src="test_shortpoll.js"></script>
74 </head>

Subscribers

People subscribed via source and target branches

to all changes: